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
cvs diff -r1.33 -r1.34 pkgsrc/devel/cfitsio/Makefile (expand / switch to unified diff)

--- 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,27 +1,26 @@ @@ -1,27 +1,26 @@
1# $NetBSD: Makefile,v 1.33 2019/11/23 06:58:14 mef Exp $ 1# $NetBSD: Makefile,v 1.34 2019/11/26 10:24:11 markd Exp $
2 2
3DISTNAME= cfitsio3450 3DISTNAME= cfitsio-3.47
4PKGNAME= ${DISTNAME:S/o3/o-3./} 4PKGNAME= ${DISTNAME}0
5CATEGORIES= devel 5CATEGORIES= devel
6MASTER_SITES= http://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/ 6MASTER_SITES= http://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= https://heasarc.gsfc.nasa.gov/docs/software/fitsio/fitsio.html 9HOMEPAGE= https://heasarc.gsfc.nasa.gov/docs/software/fitsio/fitsio.html
10COMMENT= FITS (flexible image transport system) file input and output 10COMMENT= FITS (flexible image transport system) file input and output
11# similar; no copyright claim. 11# similar; no copyright claim.
12LICENSE= isc 12LICENSE= isc
13 13
14WRKSRC= ${WRKDIR}/${PKGNAME_NOREV:C/-.*//} 
15GNU_CONFIGURE= YES 14GNU_CONFIGURE= YES
16USE_LANGUAGES= c # fortran 15USE_LANGUAGES= c # fortran
17USE_LIBTOOL= YES 16USE_LIBTOOL= YES
18 17
19MAKE_JOBS_SAFE= NO 18MAKE_JOBS_SAFE= NO
20 19
21PKGCONFIG_OVERRIDE+= cfitsio.pc.in 20PKGCONFIG_OVERRIDE+= cfitsio.pc.in
22 21
23BUILD_TARGET= all testprog 22BUILD_TARGET= all testprog
24 23
25INSTALLATION_DIRS= include lib lib/pkgconfig share/doc/cfitsio 24INSTALLATION_DIRS= include lib lib/pkgconfig share/doc/cfitsio
26 25
27CFITSIO_DOCS= cfitsio.pdf cfortran.doc fitsio.pdf fitsio.doc \ 26CFITSIO_DOCS= cfitsio.pdf cfortran.doc fitsio.pdf fitsio.doc \
cvs diff -r1.15 -r1.16 pkgsrc/devel/cfitsio/distinfo (expand / switch to unified diff)

--- 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 @@ @@ -1,8 +1,8 @@
1$NetBSD: distinfo,v 1.15 2019/11/23 06:58:14 mef Exp $ 1$NetBSD: distinfo,v 1.16 2019/11/26 10:24:11 markd Exp $
2 2
3SHA1 (cfitsio3450.tar.gz) = 85b4adeba79a7691114695e6bafd6d968e68c21f 3SHA1 (cfitsio-3.47.tar.gz) = 5a25016dcaf12117d950e4278e10d39c6c7d33a5
4RMD160 (cfitsio3450.tar.gz) = 1a421eeaed9a511e76533aa457dbd44002d23627 4RMD160 (cfitsio-3.47.tar.gz) = e0861d0c1d97d26b20a1558f6c8d5c028a6aa8ce
5SHA512 (cfitsio3450.tar.gz) = f553f9bbedc3ffabf939bb507d3c41d6dc0d889b3a0835c23a7aff90ba98d7f9a6217527d69bc8984ce9bd9664681baeec5b1555d2ab51aaca003fdb5a08127e 5SHA512 (cfitsio-3.47.tar.gz) = c0502699e266928dd25abe57730dc4b357ccc9023789fe745324ae01aa688516aceaf37321ee578f0430111d9718f0fec0dc5b54c07f935529560f00b32ce1e3
6Size (cfitsio3450.tar.gz) = 4738748 bytes 6Size (cfitsio-3.47.tar.gz) = 4853990 bytes
7SHA1 (patch-aa) = e10b375b3d62a1c1f29a38db6d02ffc89c1c40e8 7SHA1 (patch-aa) = 7613403161f03ce968760c410f9687ac91eac2b8
8SHA1 (patch-ad) = 761aedc2ae885c119ac2726ba89aaa7c193a8834 8SHA1 (patch-ad) = 761aedc2ae885c119ac2726ba89aaa7c193a8834
cvs diff -r1.7 -r1.8 pkgsrc/devel/cfitsio/patches/patch-aa (expand / switch to unified diff)

--- 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,77 +1,75 @@ @@ -1,77 +1,75 @@
1$NetBSD: patch-aa,v 1.7 2019/11/23 06:58:14 mef Exp $ 1$NetBSD: patch-aa,v 1.8 2019/11/26 10:24:11 markd Exp $
2 2
3Use libtool. 3Use libtool.
4 4
5--- Makefile.in.orig 2018-05-10 04:16:01.000000000 +0900 5--- Makefile.in.orig 2018-05-10 04:16:01.000000000 +0900
6+++ Makefile.in 2019-11-23 15:43:52.872488997 +0900 6+++ Makefile.in 2019-11-23 15:43:52.872488997 +0900
7@@ -36,14 +36,15 @@ INSTALL_DIRS = @INSTALL_ROOT@ ${CFITSIO_ 7@@ -37,13 +37,15 @@ SHELL = /bin/sh
8 SHELL = /bin/sh 
9 ARCHIVE = @ARCHIVE@ 8 ARCHIVE = @ARCHIVE@
10 RANLIB = @RANLIB@ 9 RANLIB = @RANLIB@
11-CC = @CC@ 10 CC = @CC@
12+CC = ${LIBTOOL} --mode=compile @CC@ 11+CC = ${LIBTOOL} --mode=compile @CC@
13+LD = ${LIBTOOL} --mode=link @CC@ 12+LD = ${LIBTOOL} --mode=link @CC@
14 CFLAGS = @CFLAGS@ 13 CFLAGS = @CFLAGS@
15 CPPFLAGS = @CPPFLAGS@ 14 CPPFLAGS = @CPPFLAGS@
16 SSE_FLAGS = @SSE_FLAGS@ 15 SSE_FLAGS = @SSE_FLAGS@
17 FC = @FC@ 16 FC = @FC@
18 LDFLAGS = @LDFLAGS@ 17 LDFLAGS = @LDFLAGS@
19 LDFLAGS_BIN = @LDFLAGS_BIN@ 18 LDFLAGS_BIN = @LDFLAGS_BIN@
20-DEFS = @DEFS@ 19-DEFS = @DEFS@
21+DEFS = @DEFS@ -Dunix 20+DEFS = @DEFS@ -Dunix
22 LIBS = @LIBS@ 21 LIBS = @LIBS@
 22 LIBS_CURL = @LIBS_CURL@
23 FLEX = flex 23 FLEX = flex
24 BISON = bison 24@@ -94,10 +96,10 @@ all:
25@@ -93,11 +94,11 @@ all: 
26 all-nofitsio: 25 all-nofitsio:
27 ${MAKE} stand_alone "FITSIO_SRC=" 26 ${MAKE} stand_alone "FITSIO_SRC="
28  27
29-stand_alone: lib${PACKAGE}.a 28-stand_alone: lib${PACKAGE}.a shared
30+stand_alone: lib${PACKAGE}.la 29+stand_alone: lib${PACKAGE}.la
31  30
32-lib${PACKAGE}.a: ${OBJECTS} 31-lib${PACKAGE}.a: ${OBJECTS}
33- ${ARCHIVE} $@ ${OBJECTS}; \ 32- ${ARCHIVE} $@ ${OBJECTS}; \
34- ${RANLIB} $@; 33- ${RANLIB} $@;
35+lib${PACKAGE}.la: ${OBJECTS} 34+lib${PACKAGE}.la: ${OBJECTS}
36+ ${ARCHIVE} $lib${PACKAGE}.la ${OBJECTS}; \ 35+ ${ARCHIVE} $lib${PACKAGE}.la ${OBJECTS}; \
37+ ${LIBTOOL} --mode=link @CC@ -o $@ ${OBJECTS:.o=.lo} -rpath ${PREFIX}/lib -version-info 3:0 36+ ${LIBTOOL} --mode=link @CC@ -o $@ ${OBJECTS:.o=.lo} ${LIBS_CURL} -rpath ${PREFIX}/lib -version-info 3:0
38  37
39 shared: lib${PACKAGE}${SHLIB_SUFFIX} 38 shared: lib${PACKAGE}${SHLIB_SUFFIX}
40  39@@ -109,16 +111,17 @@ lib${PACKAGE}${SHLIB_SUFFIX}: ${OBJECTS}
41@@ -108,16 +109,17 @@ lib${PACKAGE}${SHLIB_SUFFIX}: ${OBJECTS} 
42 ln -sf ${CFITSIO_SHLIB_SONAME} $@; \ 40 ln -sf ${CFITSIO_SHLIB_SONAME} $@; \
43 fi 41 fi
44  42
45-install: lib${PACKAGE}.a ${INSTALL_DIRS} 43-install: lib${PACKAGE}.a ${INSTALL_DIRS}
46- @for lib in lib${PACKAGE}.a lib${PACKAGE}${SHLIB_SUFFIX} \ 44- @for lib in lib${PACKAGE}.a lib${PACKAGE}${SHLIB_SUFFIX} \
47+install: lib${PACKAGE}.la ${INSTALL_DIRS} 45+install: lib${PACKAGE}.la ${INSTALL_DIRS}
48+ ${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} libcfitsio.la ${CFITSIO_LIB} 46+ ${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} libcfitsio.la ${CFITSIO_LIB}
49+ @for lib in lib${PACKAGE}${SHLIB_SUFFIX} \ 47+ @for lib in lib${PACKAGE}${SHLIB_SUFFIX} \
50 ${CFITSIO_SHLIB} ${CFITSIO_SHLIB_SONAME}; do \ 48 ${CFITSIO_SHLIB} ${CFITSIO_SHLIB_SONAME}; do \
51 if [ -f $$lib ]; then \ 49 if [ -f $$lib ]; then \
52 echo "/bin/cp -a $$lib ${CFITSIO_LIB}"; \ 50 echo "/bin/cp -a $$lib ${CFITSIO_LIB}"; \
53- /bin/cp -a $$lib ${CFITSIO_LIB}; \ 51- /bin/cp -a $$lib ${CFITSIO_LIB}; \
54+ ${BSD_INSTALL_DATA} -a $$lib ${CFITSIO_LIB}; \ 52+ ${BSD_INSTALL_DATA} -a $$lib ${CFITSIO_LIB}; \
55 fi; \ 53 fi; \
56 done 54 done
57- /bin/cp fitsio.h fitsio2.h longnam.h drvrsmem.h ${CFITSIO_INCLUDE} 55- /bin/cp fitsio.h fitsio2.h longnam.h drvrsmem.h ${CFITSIO_INCLUDE}
58- /bin/cp cfitsio.pc ${CFITSIO_LIB}/pkgconfig 56- /bin/cp cfitsio.pc ${CFITSIO_LIB}/pkgconfig
59+ ${BSD_INSTALL_DATA} fitsio.h fitsio2.h longnam.h drvrsmem.h ${CFITSIO_INCLUDE} 57+ ${BSD_INSTALL_DATA} fitsio.h fitsio2.h longnam.h drvrsmem.h ${CFITSIO_INCLUDE}
60+ ${BSD_INSTALL_DATA} cfitsio.pc ${CFITSIO_LIB}/pkgconfig 58+ ${BSD_INSTALL_DATA} cfitsio.pc ${CFITSIO_LIB}/pkgconfig
61 @for task in ${FPACK_UTILS} ${UTILS}; do \ 59 @for task in ${FPACK_UTILS} ${UTILS}; do \
62 if [ -f $$task ]; then \ 60 if [ -f $$task ]; then \
63 if [ ! -d ${CFITSIO_BIN} ]; then mkdir -p ${CFITSIO_BIN}; fi; \ 61 if [ ! -d ${CFITSIO_BIN} ]; then mkdir -p ${CFITSIO_BIN}; fi; \
64@@ -138,29 +140,29 @@ utils: ${FPACK_UTILS} ${UTILS} 62@@ -139,29 +142,29 @@ utils: ${FPACK_UTILS} ${UTILS}
65 swapproc.o: swapproc.c 63 swapproc.o: swapproc.c
66 ${CC} -c ${CFLAGS} ${CPPFLAGS} ${SSE_FLAGS} ${DEFS} $< 64 ${CC} -c ${CFLAGS} ${CPPFLAGS} ${SSE_FLAGS} ${DEFS} $<
67  65
68-smem: smem.o lib${PACKAGE}.a ${OBJECTS} 66-smem: smem.o lib${PACKAGE}.a ${OBJECTS}
69- ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm 67- ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm
70+smem: smem.o lib${PACKAGE}.la ${OBJECTS} 68+smem: smem.o lib${PACKAGE}.la ${OBJECTS}
71+ ${LD} $(CFLAGS) $(DEFS) -o smem smem.o -L. -lcfitsio -lm 69+ ${LD} $(CFLAGS) $(DEFS) -o smem smem.o -L. -lcfitsio -lm
72  70
73-testprog: testprog.o lib${PACKAGE}.a ${OBJECTS} 71-testprog: testprog.o lib${PACKAGE}.a ${OBJECTS}
74- ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS} 72- ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS}
75+testprog: testprog.o lib${PACKAGE}.la ${OBJECTS} 73+testprog: testprog.o lib${PACKAGE}.la ${OBJECTS}
76+ ${LD} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS} 74+ ${LD} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS}
77  75