<pre style='margin:0'>
Marius Schamschula (Schamschula) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/58e81493a4827265be8da915d54d1c6b68a92932">https://github.com/macports/macports-ports/commit/58e81493a4827265be8da915d54d1c6b68a92932</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 58e81493a48 montage: update to 6.0
</span>58e81493a48 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 58e81493a4827265be8da915d54d1c6b68a92932
</span>Author: Marius Schamschula <mps@macports.org>
AuthorDate: Sat May 22 13:45:01 2021 -0500
<span style='display:block; white-space:pre;color:#404040;'> montage: update to 6.0
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> revision bump py-montage
</span>---
python/py-montage/Portfile | 2 +-
science/montage/Portfile | 23 ++++++++++--------
science/montage/files/patch-lib-src-Makefile.diff | 27 ++++++++++++++++++++++
...atch-lib-src-two_plane_v1.1-initdistdata.c.diff | 14 -----------
4 files changed, 42 insertions(+), 24 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-montage/Portfile b/python/py-montage/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4a9d35dd67f..74f239085b4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-montage/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-montage/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup python 1.0
</span>
name py-montage
version 0.9.9
<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-append science
platforms darwin
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/montage/Portfile b/science/montage/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c0ea4a7c1c8..68d404403e1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/montage/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/montage/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,8 +3,8 @@
</span> PortSystem 1.0
name montage
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 6.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> platforms darwin
categories science
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,13 +17,18 @@ license BSD
</span> homepage http://montage.ipac.caltech.edu/
master_sites http://montage.ipac.caltech.edu/download/
distname Montage_v${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 5657d2948d997941b6c3037da87263db91b0e339 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 a4776d3f050ac9aed966de47986ee44f613f04b29fca55f72062754cfc258067 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 6967237
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-lib-src-two_plane_v1.1-initdistdata.c.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append path:include/turbojpeg.h:libjpeg-turbo port:cfitsio
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 b057f43ed6286c95d9d5f911ae2a4baf1bfe80a2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 1f540a7389d30fcf9f8cd9897617cc68b19350fbcde97c4d1cdc5634de1992c6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 20681949
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:bzip2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:cfitsio \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:freetype \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:include/turbojpeg.h:libjpeg-turbo \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:wcslib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:wcstools
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-lib-src-Makefile.diff
</span>
use_configure no
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/montage/files/patch-lib-src-Makefile.diff b/science/montage/files/patch-lib-src-Makefile.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..9de4afe1a30
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/montage/files/patch-lib-src-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,27 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lib/src/Makefile.orig 2018-10-21 20:26:00.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib/src/Makefile 2021-05-22 12:12:44.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,6 +1,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ all:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- (cd bzip2-1.0.6; make; cp libbz2.a ../..; cp bzlib.h ../../include)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- (cd cfitsio-3.25; ./configure; make; cp libcfitsio.a ../..; cp *.h ../../include)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (cd cmd; make; make install)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (cd coord; make; make install)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (cd mtbl; make; make install)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -12,11 +10,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (cd wcssubs3.9.0_montage; make; cp libwcs.a ../..; cp *.h ../../include)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (cd two_plane_v1.1; make; make install)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (cd lodepng_20140823; make; make install)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- (cd jpeg-8b; ./configure --with-pic; make; cp .libs/libjpeg.a ../..; cp jpeglib.h jconfig.h jmorecfg.h ../../include)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- (cd freetype-2.9.1; ./configure --prefix=`pwd`/../../freetype --without-png --without-zlib; make; make install)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (cd ..; ranlib *.a)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ chmod 644 ../include/*.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# (cd bzip2-1.0.6; make; cp libbz2.a ../..; cp bzlib.h ../../include)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# (cd cfitsio-3.25; ./configure; make; cp libcfitsio.a ../..; cp *.h ../../include)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# (cd freetype-2.9.1; ./configure --prefix=`pwd`/../../freetype --without-png --without-zlib; make; make install)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# (cd jpeg-8b; ./configure --with-pic; make; cp .libs/libjpeg.a ../..; cp jpeglib.h jconfig.h jmorecfg.h ../../include)
</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;'>+ clean:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rm -rf ../include/* ../freetype ../*.a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (cd bzip2-1.0.6; make clean)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/montage/files/patch-lib-src-two_plane_v1.1-initdistdata.c.diff b/science/montage/files/patch-lib-src-two_plane_v1.1-initdistdata.c.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 8b7b09a942d..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/montage/files/patch-lib-src-two_plane_v1.1-initdistdata.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,14 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- lib/src/two_plane_v1.1/initdistdata.c.orig 2013-11-01 00:30:20.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ lib/src/two_plane_v1.1/initdistdata.c 2013-11-01 00:25:05.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -28,9 +28,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (I_fits_return_status != 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fprintf(stderr, "Error closing file\n");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return -1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return 0;
</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:#ffe0e0;'>- int initdata_byheader(char *fitsheader, DistCoeff *coeff)
</span></pre><pre style='margin:0'>
</pre>