<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/d024d496ac74819241c25d20ad4c35ee3da1bdb4">https://github.com/macports/macports-ports/commit/d024d496ac74819241c25d20ad4c35ee3da1bdb4</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit d024d496ac74819241c25d20ad4c35ee3da1bdb4
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Thu Nov 15 20:52:58 2018 -0600
<span style='display:block; white-space:pre;color:#404040;'> wcslib: Update to 6.2
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Use configure.args to specify what to enable and where the dependencies'
</span><span style='display:block; white-space:pre;color:#404040;'> files are.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Patch the configure script so that it does not also look elsewhere.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Remove redundant flags from configure.cppflags and configure.ldflags
</span><span style='display:block; white-space:pre;color:#404040;'> which in the case of cppflags could lead to build failure depending on
</span><span style='display:block; white-space:pre;color:#404040;'> what files are installed in ${prefix}/include.
</span>---
science/wcslib/Portfile | 31 ++++++++++++---
science/wcslib/files/patch-configure.diff | 66 +++++++++++++++++++++++++++++--
2 files changed, 87 insertions(+), 10 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 b072ab7..342eb90b 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,7 +4,11 @@ PortSystem 1.0
</span> PortGroup compilers 1.0
name wcslib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 5.17
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 6.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 9a1f4b3660f21fe86affd2e5562e39d00341fd57 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 bb4dfe242959bc4e5540890e0475754ad4a027dba971903dc4d82df8d564d805 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 2377603
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> categories science
license LGPL-3+
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,17 +23,28 @@ master_sites ftp://ftp.atnf.csiro.au/pub/software/wcslib/ \
</span> ftp://ftp.eso.org/pub/dfs/pipelines/libraries/wcslib/
use_bzip2 yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 425e227f0293b73e2cbfd3ec6e1c68d7d7400f1f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 5c9cb5c86be01703f6488774ef3ea44fd6918a4dcdfddc70855905c05de8436c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> depends_lib port:cfitsio
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args --disable-fortran
</span>
universal_variant no
use_parallel_build no
patchfiles patch-configure.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args --disable-fortran \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-cfitsio \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-cfitsioinc=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-cfitsiolib=${prefix}/lib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --without-pgplot
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# The -I flag from CPPFLAGS ends up in the wrong place on the build line
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# (before the -I flags for source directories). The build system will add
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# its own -I and -L flags from the --with-cfitsioinc and --with-cfitsiolib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# configure args.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cppflags-delete \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -I${prefix}/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.ldflags-delete \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -L${prefix}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> livecheck.type regex
livecheck.url http://www.atnf.csiro.au/people/mcalabre/WCS/CHANGES
livecheck.regex "WCSLIB version (\\d+\\.\\d+\(\\.\\d+\)?)"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,5 +54,9 @@ compilers.setup
</span>
if {[fortran_variant_isset]} {
depends_lib-append port:pgplot
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete --disable-fortran
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace --disable-fortran --enable-fortran
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace --without-pgplot --with-pgplot
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-pgplotinc=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-pgplotlib=${prefix}/lib
</span> }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/wcslib/files/patch-configure.diff b/science/wcslib/files/patch-configure.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 8c2c243..36fa914 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/patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +1,69 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2014-05-21 01:06:01.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2014-05-21 01:05:37.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -9837,7 +9837,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Set the install_name.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Don't search in directories we didn't specify.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2018-10-20 05:03:18.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2018-11-15 21:56:02.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -6896,7 +6896,7 @@
</span> darwin*)
SHRLIB="libwcs.$LIBVER.dylib"
SONAME="libwcs.$SHVER.dylib"
- SHRLD="$SHRLD -dynamiclib -single_module"
+ SHRLD="$SHRLD -dynamiclib -install_name $prefix/lib/$SONAME -single_module"
SHRLD="$SHRLD -compatibility_version $SHVER -current_version $LIBVER"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- SHRLN=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SHRLN="libwcs.dylib"
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7427,14 +7427,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test "x$with_cfitsioinc" != x ; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFITSIO_INCDIRS="$with_cfitsioinc"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- CFITSIO_INCDIRS="$CFITSIO_INCDIRS \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /usr/local/cfitsio/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /local/cfitsio/include"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- LIBDIRS="$LIBDIRS \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /usr/local/cfitsio/lib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /local/cfitsio/lib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7466,26 +7458,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test "x$with_pgplotinc" != x ; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PGPLOT_INCDIRS="$with_pgplotinc"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PGPLOT_INCDIRS="$PGPLOT_INCDIRS \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /usr/local/pgplot/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /local/pgplot/include"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- LIBDIRS="$LIBDIRS \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /usr/local/pgplot/lib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /local/pgplot/lib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test "x$with_cfitsio" != xno -o \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "x$with_pgplot" != xno ; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- LIBDIRS="$LIBDIRS \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /usr/local/lib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /local/lib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /opt/local/lib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /opt/SUNWspro/lib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /sw/lib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for LIBDIR in $LIBDIRS ; do
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ as_ac_File=`$as_echo "ac_cv_file_$LIBDIR" | $as_tr_sh`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LIBDIR" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7513,12 +7490,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ done
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Generic include directories.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- INCDIRS="/usr/local/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /local/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /opt/local/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /sw/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /local \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /usr/include"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ INCDIRS=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # CFITSIO.
</span></pre><pre style='margin:0'>
</pre>