<pre style='margin:0'>
Leo Singer (lpsinger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/cc5bf1ba0e2474d02bf2a500a21b33028d6e70cc">https://github.com/macports/macports-ports/commit/cc5bf1ba0e2474d02bf2a500a21b33028d6e70cc</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 cc5bf1b cfitsio: update to 3.410
</span>cc5bf1b is described below
<span style='display:block; white-space:pre;color:#808000;'>commit cc5bf1ba0e2474d02bf2a500a21b33028d6e70cc
</span>Author: Leo Singer <leo.singer@ligo.org>
AuthorDate: Tue Sep 19 12:44:04 2017 -0400
<span style='display:block; white-space:pre;color:#404040;'> cfitsio: update to 3.410
</span>---
science/cfitsio/Portfile | 7 +++----
science/cfitsio/files/patch-Makefile.in.diff | 22 +++++++++++----------
science/cfitsio/files/patch-configure.diff | 29 +++++++++++++---------------
3 files changed, 28 insertions(+), 30 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/cfitsio/Portfile b/science/cfitsio/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5030f89..b243c48 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/cfitsio/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/cfitsio/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,8 +4,7 @@ PortSystem 1.0
</span> PortGroup compilers 1.0
name cfitsio
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.390
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.410
</span> categories science
license zlib MIT {LGPL Noncommercial}
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,8 +28,8 @@ master_sites https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/
</span> distname ${name}[strsed ${version} {g/\.//}]
worksrcdir ${name}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 515146dd69dfacc0a41f5d2727332c81b9fa501b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 62d3d8f38890275cc7a78f5e9a4b85d7053e75ae43e988f1e2390e539ba7f409
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 5a99607ec1ac01286d8e36d9d9f01ce35622f07b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 a556ac7ea1965545dcb4d41cfef8e4915eeb8c0faa1b52f7ff70870f8bb5734c
</span>
patchfiles patch-configure.diff patch-Makefile.in.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/cfitsio/files/patch-Makefile.in.diff b/science/cfitsio/files/patch-Makefile.in.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 5ea55a5..d0824db 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/cfitsio/files/patch-Makefile.in.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/cfitsio/files/patch-Makefile.in.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +1,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Makefile.in.orig 2012-07-17 15:38:34.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Makefile.in 2012-10-08 18:42:23.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -110,7 +110,7 @@ lib${PACKAGE}${SHLIB_SUFFIX}: ${OBJECTS}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- install: lib${PACKAGE}.a ${INSTALL_DIRS}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /bin/cp -a lib${PACKAGE}* ${CFITSIO_LIB}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /bin/cp -pPR lib${PACKAGE}* ${CFITSIO_LIB}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Makefile.in.orig 2017-09-19 12:39:34.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Makefile.in 2017-09-19 12:40:51.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -113,8 +113,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @for lib in lib${PACKAGE}.a lib${PACKAGE}${SHLIB_SUFFIX} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${CFITSIO_SHLIB} ${CFITSIO_SHLIB_SONAME}; do \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if [ -f $$lib ]; then \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo "/bin/cp -a $$lib ${CFITSIO_LIB}"; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /bin/cp -a $$lib ${CFITSIO_LIB}; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo "/bin/cp -pPR $$lib ${CFITSIO_LIB}"; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /bin/cp -pPR $$lib ${CFITSIO_LIB}; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ done
</span> /bin/cp fitsio.h fitsio2.h longnam.h drvrsmem.h ${CFITSIO_INCLUDE}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- /bin/cp cfitsio.pc ${CFITSIO_LIB}/pkgconfig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @for task in ${FPACK_UTILS} ${UTILS}; do \
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/cfitsio/files/patch-configure.diff b/science/cfitsio/files/patch-configure.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index f69574c..bcd2720 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/cfitsio/files/patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/cfitsio/files/patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,31 +1,28 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2016-04-29 08:11:26.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2016-07-11 03:45:18.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4486,10 +4486,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2017-09-19 12:31:24.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2017-09-19 12:35:01.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4486,9 +4486,9 @@
</span> # Build for i386 & x86_64 architectures on Darwin 10.x or newer:
case $host in
- *darwin[56789]*)
- ;;
*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span> + ;;
+ idontthinkso)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Test to see whether the C compiler accepts the "-arch"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # flags for building "universal" binaries (Apple XCode only):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SAVE_CFLAGS="$CFLAGS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4723,10 +4723,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo "int main(){return(0);}" > /tmp/$$.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $CC -v -o /tmp/$$.out /tmp/$$.c 2> /tmp/$$.log
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4695,10 +4695,10 @@
</span> CFITSIO_SHLIB="lib\${PACKAGE}.\${CFITSIO_SONAME}.\${CFITSIO_MAJOR}.\${CFITSIO_MINOR}\${SHLIB_SUFFIX}"
CFITSIO_SHLIB_SONAME="lib\${PACKAGE}.\${CFITSIO_SONAME}\${SHLIB_SUFFIX}"
case $host in
- *darwin[56789]*)
- SHLIB_LD="$CC -dynamiclib -install_name lib\${PACKAGE}.\${CFITSIO_SONAME}\${SHLIB_SUFFIX} -compatibility_version \${CFITSIO_SONAME} -current_version \${CFITSIO_SONAME}.\${CFITSIO_MAJOR}.\${CFITSIO_MINOR}"
- ;;
<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:#ffe0e0;'>-+ SHLIB_LD="$CC -dynamiclib -install_name @@MPORTS_PREFIX@@/lib/libcfitsio.dylib -compatibility_version \${CFITSIO_SONAME} -current_version \${CFITSIO_SONAME}.\${CFITSIO_MAJOR}.\${CFITSIO_MINOR}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ idontthinkso)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Build for i386 & x86_64 architectures on Darwin 10.x or newer:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ SHLIB_LD="$CC -dynamiclib -install_name @@MPORTS_PREFIX@@/lib/libcfitsio.dylib -compatibility_version \${CFITSIO_SONAME} -current_version \${CFITSIO_SONAME}.\${CFITSIO_MAJOR}.\${CFITSIO_MINOR}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ idontthinkso)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Build 'Universal' binaries (i386 & x86_64 architectures) and
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # use rpath token on Darwin 10.x or newer:
</span> SHLIB_LD="$CC -dynamiclib $C_UNIV_SWITCH -headerpad_max_install_names -install_name @rpath/lib\${PACKAGE}.\${CFITSIO_SONAME}\${SHLIB_SUFFIX} -compatibility_version \${CFITSIO_SONAME} -current_version \${CFITSIO_SONAME}.\${CFITSIO_MAJOR}.\${CFITSIO_MINOR}"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ;;
</span></pre><pre style='margin:0'>
</pre>