Tue Nov 26 10:24:11 2019 UTC ()
cfitsio: update to 3.470
fix linking of libcurl.
Version 3.47 - May 2019
- Added set of drivers for performing ftps file transfers.
- Tile sizes for compression may now be specified for any pair of
axes, where previously 2D tiles where limited to just X and y.
- Fix to ffgsky and ffgkls functions for case of keyword with long
string values where the final CONTINUE statement ended with '&'.
If the final CONTINUE also contained a comment, it was being
repeated twice when passed back through the 'comm' argument.
- Fix made to ffedit_columns() for case of multiple col filters
containing wildcards. Only the first filter was being searched.
- fits_copy_rows (ffcprw) can now handle 'P'-type variable-length
columns.
- Fix made to an obscure case in fits_modify_vector_len, where a
wrongly issued EOF error may occur.
- Added internal fffvcl() function.
Version 3.46 - Oct 2018 (Ftools release)
- Improved the algorithm for ensuring no tile dimensions are smaller
than 4 pixels for HCOMPRESS compression.
- Added new functions intended to assist in diagnosing (primarily
https) download issues: fits_show_download_progress,
fits_get_timeout, fits_set_timeout.
- Added the '-O <file>' option to fpack, which previously existed only
for funpack. Also added fpack/funpack auto-removal of .bz2 suffix
equivalent to what existed for .gz.
- For the fpack '-table' cases, warning message is now sent to stderr
instead of stdout. This is to allow users to pipe the results from
stdout in valid FITS format. (The warning message is otherwise placed
at the start of the FITS file and therefore corrupts it.)
- Fix made to the '-P' file prefix option in funpack.
- Added wildcard deletion syntax for columns, i.e. -COLNAM* will delete
the first matching column as always; -COLNAM*+ will delete all matching
columns (or none); exact symmetry with the keyword deletion syntax.
(markd)
diff -r1.33 -r1.34 pkgsrc/devel/cfitsio/Makefile
diff -r1.15 -r1.16 pkgsrc/devel/cfitsio/distinfo
diff -r1.7 -r1.8 pkgsrc/devel/cfitsio/patches/patch-aa
--- pkgsrc/devel/cfitsio/Makefile 2019/11/23 06:58:14 1.33
+++ pkgsrc/devel/cfitsio/Makefile 2019/11/26 10:24:11 1.34
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.33 2019/11/23 06:58:14 mef Exp $
+# $NetBSD: Makefile,v 1.34 2019/11/26 10:24:11 markd Exp $
-DISTNAME= cfitsio3450
-PKGNAME= ${DISTNAME:S/o3/o-3./}
+DISTNAME= cfitsio-3.47
+PKGNAME= ${DISTNAME}0
CATEGORIES= devel
MASTER_SITES= http://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/
@@ -11,7 +11,6 @@
# similar; no copyright claim.
LICENSE= isc
-WRKSRC= ${WRKDIR}/${PKGNAME_NOREV:C/-.*//}
GNU_CONFIGURE= YES
USE_LANGUAGES= c # fortran
USE_LIBTOOL= YES
--- pkgsrc/devel/cfitsio/distinfo 2019/11/23 06:58:14 1.15
+++ pkgsrc/devel/cfitsio/distinfo 2019/11/26 10:24:11 1.16
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.15 2019/11/23 06:58:14 mef Exp $
+$NetBSD: distinfo,v 1.16 2019/11/26 10:24:11 markd Exp $
-SHA1 (cfitsio3450.tar.gz) = 85b4adeba79a7691114695e6bafd6d968e68c21f
-RMD160 (cfitsio3450.tar.gz) = 1a421eeaed9a511e76533aa457dbd44002d23627
-SHA512 (cfitsio3450.tar.gz) = f553f9bbedc3ffabf939bb507d3c41d6dc0d889b3a0835c23a7aff90ba98d7f9a6217527d69bc8984ce9bd9664681baeec5b1555d2ab51aaca003fdb5a08127e
-Size (cfitsio3450.tar.gz) = 4738748 bytes
-SHA1 (patch-aa) = e10b375b3d62a1c1f29a38db6d02ffc89c1c40e8
+SHA1 (cfitsio-3.47.tar.gz) = 5a25016dcaf12117d950e4278e10d39c6c7d33a5
+RMD160 (cfitsio-3.47.tar.gz) = e0861d0c1d97d26b20a1558f6c8d5c028a6aa8ce
+SHA512 (cfitsio-3.47.tar.gz) = c0502699e266928dd25abe57730dc4b357ccc9023789fe745324ae01aa688516aceaf37321ee578f0430111d9718f0fec0dc5b54c07f935529560f00b32ce1e3
+Size (cfitsio-3.47.tar.gz) = 4853990 bytes
+SHA1 (patch-aa) = 7613403161f03ce968760c410f9687ac91eac2b8
SHA1 (patch-ad) = 761aedc2ae885c119ac2726ba89aaa7c193a8834
--- pkgsrc/devel/cfitsio/patches/patch-aa 2019/11/23 06:58:14 1.7
+++ pkgsrc/devel/cfitsio/patches/patch-aa 2019/11/26 10:24:11 1.8
@@ -1,14 +1,13 @@
-$NetBSD: patch-aa,v 1.7 2019/11/23 06:58:14 mef Exp $
+$NetBSD: patch-aa,v 1.8 2019/11/26 10:24:11 markd Exp $
Use libtool.
--- Makefile.in.orig 2018-05-10 04:16:01.000000000 +0900
+++ Makefile.in 2019-11-23 15:43:52.872488997 +0900
-@@ -36,14 +36,15 @@ INSTALL_DIRS = @INSTALL_ROOT@ ${CFITSIO_
- SHELL = /bin/sh
+@@ -37,13 +37,15 @@ SHELL = /bin/sh
ARCHIVE = @ARCHIVE@
RANLIB = @RANLIB@
--CC = @CC@
+ CC = @CC@
+CC = ${LIBTOOL} --mode=compile @CC@
+LD = ${LIBTOOL} --mode=link @CC@
CFLAGS = @CFLAGS@
@@ -20,13 +19,13 @@
-DEFS = @DEFS@
+DEFS = @DEFS@ -Dunix
LIBS = @LIBS@
+ LIBS_CURL = @LIBS_CURL@
FLEX = flex
- BISON = bison
-@@ -93,11 +94,11 @@ all:
+@@ -94,10 +96,10 @@ all:
all-nofitsio:
${MAKE} stand_alone "FITSIO_SRC="
--stand_alone: lib${PACKAGE}.a
+-stand_alone: lib${PACKAGE}.a shared
+stand_alone: lib${PACKAGE}.la
-lib${PACKAGE}.a: ${OBJECTS}
@@ -34,11 +33,10 @@
- ${RANLIB} $@;
+lib${PACKAGE}.la: ${OBJECTS}
+ ${ARCHIVE} $lib${PACKAGE}.la ${OBJECTS}; \
-+ ${LIBTOOL} --mode=link @CC@ -o $@ ${OBJECTS:.o=.lo} -rpath ${PREFIX}/lib -version-info 3:0
++ ${LIBTOOL} --mode=link @CC@ -o $@ ${OBJECTS:.o=.lo} ${LIBS_CURL} -rpath ${PREFIX}/lib -version-info 3:0
shared: lib${PACKAGE}${SHLIB_SUFFIX}
-
-@@ -108,16 +109,17 @@ lib${PACKAGE}${SHLIB_SUFFIX}: ${OBJECTS}
+@@ -109,16 +111,17 @@ lib${PACKAGE}${SHLIB_SUFFIX}: ${OBJECTS}
ln -sf ${CFITSIO_SHLIB_SONAME} $@; \
fi
@@ -61,7 +59,7 @@
@for task in ${FPACK_UTILS} ${UTILS}; do \
if [ -f $$task ]; then \
if [ ! -d ${CFITSIO_BIN} ]; then mkdir -p ${CFITSIO_BIN}; fi; \
-@@ -138,29 +140,29 @@ utils: ${FPACK_UTILS} ${UTILS}
+@@ -139,29 +142,29 @@ utils: ${FPACK_UTILS} ${UTILS}
swapproc.o: swapproc.c
${CC} -c ${CFLAGS} ${CPPFLAGS} ${SSE_FLAGS} ${DEFS} $<