<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/cb5da9fd9bd479c5987e0601b68459f46b563734">https://github.com/macports/macports-ports/commit/cb5da9fd9bd479c5987e0601b68459f46b563734</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit cb5da9fd9bd479c5987e0601b68459f46b563734
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Mon Jan 24 14:24:45 2022 -0600
<span style='display:block; white-space:pre;color:#404040;'> wcslib: Update to 7.7
</span>---
science/wcslib/Portfile | 13 ++++-----
science/wcslib/files/install_name.patch | 33 ++++++++++++++++++++++
...atch-configure.diff => no-strange-places.patch} | 20 ++++---------
3 files changed, 45 insertions(+), 21 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/wcslib/Portfile b/science/wcslib/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f64273203c2..c54071d23e9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/wcslib/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/wcslib/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,16 +4,14 @@ PortSystem 1.0
</span> PortGroup compilers 1.0
name wcslib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 7.4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 7.7
</span> revision 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 b63669190483c1becbd58cb37ba3e8f1a8b2343f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 a21c964136055ad1d68ca9d3e9714374a9dc3ff2f7072622af08cc4f5a0c511c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 2446483
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 e12cf7f8a522b79c7c74b95af826ec126c91cf4d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 a708e6b4e90e2cd6427434715b591bb9c3d4005c99725ec494b8e0bed2de5355 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 2515760
</span>
categories science
license LGPL-3+
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span> maintainers nomaintainer
description Library for handling World Coordinate System in FITS files
long_description A C library, with a set of Fortran wrappers, that \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,7 +28,8 @@ depends_lib port:cfitsio
</span> universal_variant no
use_parallel_build no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles install_name.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ no-strange-places.patch
</span>
configure.args --disable-fortran \
--with-cfitsio \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/wcslib/files/install_name.patch b/science/wcslib/files/install_name.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..156192e5053
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/wcslib/files/install_name.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,33 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix the library's install_name.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+SHRLD has to be set after LIBDIR is set.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2021-07-12 01:36:51.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2022-01-24 14:05:30.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -6971,7 +6971,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SHRLIB="libwcs.$LIBVER.dylib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SONAME="libwcs.$SHVER.dylib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SHRLD="$SHRLD -dynamiclib -single_module"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- SHRLD="$SHRLD -compatibility_version $SHVER -current_version $LIBVER -install_name \$(SONAME)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ SHRLD="$SHRLD -compatibility_version $SHVER -current_version $LIBVER -install_name \$(LIBDIR)/\$(SONAME)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SHRLN="libwcs.dylib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case "$host_cpu" in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- makedefs.in.orig 2021-07-12 01:36:49.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ makedefs.in 2022-01-24 14:17:33.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -112,7 +112,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SHRLIB := @SHRLIB@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SONAME := @SONAME@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SHRFLAGS := @SHRFLAGS@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- SHRLD := @SHRLD@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SHRLN := @SHRLN@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # What subdirectories to build.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -143,6 +142,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PDFDIR := $(DESTDIR)@pdfdir@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MANDIR := $(DESTDIR)@mandir@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ SHRLD := @SHRLD@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # For putting timestamps in the build log.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TIMER := date +"%a %Y/%m/%d %X %z, executing on $$HOST"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/wcslib/files/patch-configure.diff b/science/wcslib/files/no-strange-places.patch
</span>similarity index 71%
rename from science/wcslib/files/patch-configure.diff
rename to science/wcslib/files/no-strange-places.patch
<span style='display:block; white-space:pre;color:#808080;'>index ec7526dedfc..6b5d380952a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/wcslib/files/patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/wcslib/files/no-strange-places.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,15 +1,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2020-03-09 02:31:27.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2020-03-14 08:44:37.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -6951,7 +6951,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- darwin*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SHRLIB="libwcs.$LIBVER.dylib"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SONAME="libwcs.$SHVER.dylib"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- SHRLD="$SHRLD -dynamiclib -single_module"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ SHRLD="$SHRLD -dynamiclib -install_name $prefix/lib/$SONAME -single_module"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SHRLD="$SHRLD -compatibility_version $SHVER -current_version $LIBVER"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SHRLN="libwcs.dylib"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -7475,14 +7475,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Don't look for things in strange places.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2021-07-12 01:36:51.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2022-01-24 14:05:30.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7500,14 +7500,6 @@
</span> if test "x$with_cfitsioinc" != x ; then
CFITSIO_INCDIRS="$with_cfitsioinc"
fi
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,7 +16,7 @@
</span> fi
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -7514,26 +7506,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7539,26 +7531,11 @@
</span> if test "x$with_pgplotinc" != x ; then
PGPLOT_INCDIRS="$with_pgplotinc"
fi
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -51,7 +43,7 @@
</span> for LIBDIR in $LIBDIRS ; do
as_ac_File=`$as_echo "ac_cv_file_$LIBDIR" | $as_tr_sh`
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LIBDIR" >&5
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -7561,12 +7538,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7586,12 +7563,7 @@
</span> done
# Generic include directories.
</pre><pre style='margin:0'>
</pre>