CVS commit: pkgsrc/devel/cfitsio

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/devel/cfitsio
From: "Adam Ciarcinski" <adam%netbsd.org@localhost>
Date: Sat, 22 Jul 2023 10:11:02 +0000

Module Name:    pkgsrc
Committed By:   adam
Date:           Sat Jul 22 10:11:02 UTC 2023

Modified Files:
        pkgsrc/devel/cfitsio: Makefile distinfo
Added Files:
        pkgsrc/devel/cfitsio/patches: patch-Makefile.in patch-cfortran.h
Removed Files:
        pkgsrc/devel/cfitsio/patches: patch-aa patch-ad

Log Message:
cfitsio: updated to 4.2.0

Version 4.2.0 - Nov 2022

  - This release includes patches to security vulnerabilities.  We
    strongly encourage this upgrade, particularly for those running
    CFITSIO in web accessible applications.

  - Fix to fits_read_key function, which was failing to properly read
    keywords declared type TUINT on compilers where sizeof(int) =
    sizeof(long).

  - Added new functions fits_read_cols and fits_write_cols to efficiently
    read or write multiple columns in a single function call

  - Added new function fits_copy_selrows to copy only selected rows, such
    as the selected rows returned by fits_find_rows

  - Added new calculator functions ERF(X), ERFC(X) and GAMMA(X), which are
    mathematical special functions of the same name

  - Added new calculator function GTIFIND() which reports which GTI row
    brackets a given time sample

  - Added new calculator functions which operate upon vector table
    values NAXIS(V), NAXES(V,n), ELEMENTNUM(V) and AXISELEM(V,n),
    and ARRAY(X,d) which promotes scalar X to a vector or array
    with given dimensions.

  - The CFITSIO histogramming code now handles binning by any
    arbitrary calculator expression rather than just a column name.
    Both the binned columns as well as the optional weights may be
    calculator expressions, enclosed in parentheses.

  - Binning of vector columns or expressions is now supported, as long
    as all binned inputs (as well as the optional weighting) have the
    same vector dimensions.  Binning of variable-length columns remains
    unsupported.

  - A bug that caused histogram weights from columns that are null values
    to be tallied along with non-null values has been fixed.

  - The CFITSIO calculator and histogramming functionality is now
    fully reentrant and does not require multithreading interlocks.

  - A long-standing segmentation fault bug in the histogramming code
    related to binning any value using the "reciprocal" /XXXX notation
    has been fixed.

  - Added mutex locks for thread safety in ftgiou and ftfiou.

  - Added several Fortran wrappers to support image read/write when
    'fpixel' and 'nelements' are 8-byte integers.

  - Fixed bug which was adding spaces to some cases of long string key
    value output.


To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 pkgsrc/devel/cfitsio/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/devel/cfitsio/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/cfitsio/patches/patch-Makefile.in \
    pkgsrc/devel/cfitsio/patches/patch-cfortran.h
cvs rdiff -u -r1.8 -r0 pkgsrc/devel/cfitsio/patches/patch-aa
cvs rdiff -u -r1.3 -r0 pkgsrc/devel/cfitsio/patches/patch-ad

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/cfitsio/Makefile
diff -u pkgsrc/devel/cfitsio/Makefile:1.44 pkgsrc/devel/cfitsio/Makefile:1.45
--- pkgsrc/devel/cfitsio/Makefile:1.44  Wed Apr 19 08:09:38 2023
+++ pkgsrc/devel/cfitsio/Makefile       Sat Jul 22 10:11:02 2023
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile,v 1.44 2023/04/19 08:09:38 adam Exp $
+# $NetBSD: Makefile,v 1.45 2023/07/22 10:11:02 adam Exp $
 
-DISTNAME=      cfitsio-3.47
-PKGNAME=       ${DISTNAME}0
-PKGREVISION=   10
+DISTNAME=      cfitsio-4.2.0
 CATEGORIES=    devel
 MASTER_SITES=  http://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/
 
@@ -12,32 +10,20 @@ COMMENT=    FITS (flexible image transport 
 # similar; no copyright claim.
 LICENSE=       isc
 
-GNU_CONFIGURE= YES
-USE_LANGUAGES= c # fortran
-USE_LIBTOOL=   YES
-
-MAKE_JOBS_SAFE=        NO
-
+USE_LANGUAGES=         c # fortran
+USE_LIBTOOL=           yes
+GNU_CONFIGURE=         yes
 PKGCONFIG_OVERRIDE+=   cfitsio.pc.in
 
-BUILD_TARGET=  all testprog
-
 INSTALLATION_DIRS=     include lib lib/pkgconfig share/doc/cfitsio
 
 CFITSIO_DOCS=  cfitsio.pdf cfortran.doc fitsio.pdf fitsio.doc \
                fpackguide.pdf quick.pdf
 
-post-build:
-       cd ${WRKSRC}; \
-       ./testprog > /dev/null; \
-       ${CMP} testprog.fit testprog.std
-
-pre-install:
-       rm ${WRKSRC}/testprog
-
 post-install:
-       cd ${WRKSRC}/docs; \
+       cd ${WRKSRC}/docs && \
        ${INSTALL_DATA} ${CFITSIO_DOCS} ${DESTDIR}${PREFIX}/share/doc/cfitsio
 
+.include "../../devel/zlib/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/cfitsio/distinfo
diff -u pkgsrc/devel/cfitsio/distinfo:1.18 pkgsrc/devel/cfitsio/distinfo:1.19
--- pkgsrc/devel/cfitsio/distinfo:1.18  Tue Oct 26 10:14:23 2021
+++ pkgsrc/devel/cfitsio/distinfo       Sat Jul 22 10:11:02 2023
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.18 2021/10/26 10:14:23 nia Exp $
+$NetBSD: distinfo,v 1.19 2023/07/22 10:11:02 adam Exp $
 
-BLAKE2s (cfitsio-3.47.tar.gz) = dab62fdddd57feb8e347b8151f30b3635bc004b8853380d7a6d03fda5051c474
-SHA512 (cfitsio-3.47.tar.gz) = c0502699e266928dd25abe57730dc4b357ccc9023789fe745324ae01aa688516aceaf37321ee578f0430111d9718f0fec0dc5b54c07f935529560f00b32ce1e3
-Size (cfitsio-3.47.tar.gz) = 4853990 bytes
-SHA1 (patch-aa) = 7613403161f03ce968760c410f9687ac91eac2b8
-SHA1 (patch-ad) = 761aedc2ae885c119ac2726ba89aaa7c193a8834
+BLAKE2s (cfitsio-4.2.0.tar.gz) = fe50b429537acf2f390d4b914d5586bcdc9735d33dd5990366775ddaa2e9e988
+SHA512 (cfitsio-4.2.0.tar.gz) = 41b51653370874f50a7a9fe7d5f61577a979ab9d146b8249afa407d3858cb4dce0581eba23093972b66f7d1042b9693b98ad9130ec67b3b44e94005e72d60853
+Size (cfitsio-4.2.0.tar.gz) = 4356372 bytes
+SHA1 (patch-Makefile.in) = 81211da9b3c4c654f5a9153ae761604349ea4480
+SHA1 (patch-cfortran.h) = 761aedc2ae885c119ac2726ba89aaa7c193a8834

Added files:

Index: pkgsrc/devel/cfitsio/patches/patch-Makefile.in
diff -u /dev/null pkgsrc/devel/cfitsio/patches/patch-Makefile.in:1.1
--- /dev/null   Sat Jul 22 10:11:02 2023
+++ pkgsrc/devel/cfitsio/patches/patch-Makefile.in      Sat Jul 22 10:11:02 2023
@@ -0,0 +1,117 @@
+$NetBSD: patch-Makefile.in,v 1.1 2023/07/22 10:11:02 adam Exp $
+
+Use libtool.
+
+--- Makefile.in.orig   2022-10-31 18:40:23.000000000 +0000
++++ Makefile.in
+@@ -38,13 +38,15 @@ SHELL =            /bin/sh
+ ARCHIVE =     @ARCHIVE@
+ RANLIB =      @RANLIB@
+ CC =          @CC@
++CC =          ${LIBTOOL} --mode=compile @CC@
++LD =          ${LIBTOOL} --mode=link @CC@
+ CFLAGS =      @CFLAGS@
+ CPPFLAGS =    @CPPFLAGS@
+ SSE_FLAGS =   @SSE_FLAGS@
+ FC =          @FC@
+ LDFLAGS =     @LDFLAGS@
+ LDFLAGS_BIN = @LDFLAGS_BIN@
+-DEFS =                @DEFS@
++DEFS =                @DEFS@ -Dunix
+ LIBS =                @LIBS@
+ LIBS_CURL =   @LIBS_CURL@
+ FLEX =                flex
+@@ -93,11 +95,11 @@ all:
+ all-nofitsio:
+               ${MAKE} stand_alone "FITSIO_SRC="
+ 
+-stand_alone:  lib${PACKAGE}.a shared
++stand_alone:  lib${PACKAGE}.la
+ 
+-lib${PACKAGE}.a:      ${OBJECTS}
+-              ${ARCHIVE} $@ ${OBJECTS}; \
+-              ${RANLIB} $@;
++lib${PACKAGE}.la:     ${OBJECTS}
++              ${ARCHIVE} $lib${PACKAGE}.la ${OBJECTS}; \
++              ${LIBTOOL} --mode=link @CC@ -o $@ ${OBJECTS:.o=.lo} ${LIBS_CURL} -rpath ${PREFIX}/lib -version-info 4:0
+ 
+ shared: lib${PACKAGE}${SHLIB_SUFFIX}
+ 
+@@ -108,23 +110,15 @@ lib${PACKAGE}${SHLIB_SUFFIX}: ${OBJECTS}
+                       ln -sf ${CFITSIO_SHLIB_SONAME} $@; \
+               fi
+ 
+-install:      lib${PACKAGE}.a ${INSTALL_DIRS}
+-              @for lib in lib${PACKAGE}.a lib${PACKAGE}${SHLIB_SUFFIX} \
+-                              ${CFITSIO_SHLIB} ${CFITSIO_SHLIB_SONAME}; do \
+-                  if [ -f $$lib ]; then \
+-                      echo "/bin/rm -f ${CFITSIO_LIB}/$$lib"; \
+-                      /bin/rm -f ${CFITSIO_LIB}/$$lib; \
+-                      echo "/bin/cp -a $$lib ${CFITSIO_LIB}"; \
+-                      /bin/cp -a $$lib ${CFITSIO_LIB}; \
+-                  fi; \
+-              done
+-              /bin/cp fitsio.h fitsio2.h longnam.h drvrsmem.h ${CFITSIO_INCLUDE}
+-              /bin/cp cfitsio.pc ${CFITSIO_LIB}/pkgconfig
++install:      lib${PACKAGE}.la ${INSTALL_DIRS}
++              ${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} lib${PACKAGE}.la ${CFITSIO_LIB}
++              ${BSD_INSTALL_DATA} fitsio.h fitsio2.h longnam.h drvrsmem.h ${CFITSIO_INCLUDE}
++              ${BSD_INSTALL_DATA} cfitsio.pc ${CFITSIO_LIB}/pkgconfig
+               @for task in ${FPACK_UTILS} ${UTILS}; do \
+                   if [ -f $$task ]; then \
+                       if [ ! -d ${CFITSIO_BIN} ]; then mkdir -p ${CFITSIO_BIN}; fi; \
+                       echo "/bin/cp $$task ${CFITSIO_BIN}"; \
+-                      /bin/cp $$task ${CFITSIO_BIN}; \
++                      ${BSD_INSTALL_PROGRAM} $$task ${CFITSIO_BIN}; \
+                   fi; \
+               done
+ 
+@@ -141,31 +135,31 @@ utils:           ${FPACK_UTILS} ${UTILS}
+ swapproc.o:   swapproc.c
+               ${CC} -c ${CFLAGS} ${CPPFLAGS} ${SSE_FLAGS} ${DEFS} $<
+ 
+-smem:         smem.o lib${PACKAGE}.a ${OBJECTS}
+-              ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm
++smem:         smem.o lib${PACKAGE}.la ${OBJECTS}
++              ${LD} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm
+ 
+-testprog:     testprog.o lib${PACKAGE}.a ${OBJECTS}
+-              ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS}
++testprog:     testprog.o lib${PACKAGE}.la ${OBJECTS}
++              ${LD} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS}
+ 
+-fpack:                fpack.o fpackutil.o lib${PACKAGE}.a ${OBJECTS}
+-              ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o fpackutil.o -L. -l${PACKAGE} -lm ${LIBS}
++fpack:                fpack.o fpackutil.o lib${PACKAGE}.la ${OBJECTS}
++              ${LD} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o fpackutil.o -L. -l${PACKAGE} -lm ${LIBS}
+ 
+-funpack:      funpack.o fpackutil.o lib${PACKAGE}.a ${OBJECTS}
+-              ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o fpackutil.o -L. -l${PACKAGE} -lm ${LIBS}
++funpack:      funpack.o fpackutil.o lib${PACKAGE}.la ${OBJECTS}
++              ${LD} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o fpackutil.o -L. -l${PACKAGE} -lm ${LIBS}
+ 
+-fitscopy:     fitscopy.o lib${PACKAGE}.a ${OBJECTS}
+-              ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS}
++fitscopy:     fitscopy.o lib${PACKAGE}.la ${OBJECTS}
++              ${LD} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS}
+ 
+-speed:                speed.o lib${PACKAGE}.a ${OBJECTS}
+-              ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS}
++speed:                speed.o lib${PACKAGE}.la ${OBJECTS}
++              ${LDD} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS}
+ 
+-imcopy:               imcopy.o lib${PACKAGE}.a ${OBJECTS}
+-              ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS}
++imcopy:               imcopy.o lib${PACKAGE}.la ${OBJECTS}
++              ${LD} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS}
+ 
+-cookbook:     cookbook.o lib${PACKAGE}.a ${OBJECTS}
+-              ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS}
++cookbook:     cookbook.o lib${PACKAGE}.la ${OBJECTS}
++              ${LD} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS}
+ 
+-testf77:      testf77.o lib${PACKAGE}.a ${OBJECTS}
++testf77:      testf77.o lib${PACKAGE}.la ${OBJECTS}
+               ${FC} ${LDFLAGS_BIN} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS}
+ 
+ # Tested with bison 3.8 and flex 2.6.4
Index: pkgsrc/devel/cfitsio/patches/patch-cfortran.h
diff -u /dev/null pkgsrc/devel/cfitsio/patches/patch-cfortran.h:1.1
--- /dev/null   Sat Jul 22 10:11:02 2023
+++ pkgsrc/devel/cfitsio/patches/patch-cfortran.h       Sat Jul 22 10:11:02 2023
@@ -0,0 +1,16 @@
+$NetBSD: patch-cfortran.h,v 1.1 2023/07/22 10:11:02 adam Exp $
+
+Add definition for NetBSD and DragonFlyBSD.
+
+--- cfortran.h.orig    2008-05-20 05:28:41.000000000 +1200
++++ cfortran.h
+@@ -177,6 +177,9 @@ only C calling FORTRAN subroutines will 
+ #if defined(__APPLE__)                         /* 11/2002 (CFITSIO) */
+ #define f2cFortran
+ #endif
++#if defined(__NetBSD__) || defined(__DragonFly__) /* 11/2002 (CFITSIO) */
++#define f2cFortran
++#endif
+ #if defined(__hpux)             /* 921107: Use __hpux instead of __hp9000s300 */
+ #define       hpuxFortran       /*         Should also allow hp9000s7/800 use.*/
+ #endif

Prev by Date: CVS commit: pkgsrc/graphics/ImageMagick6
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/graphics/ImageMagick6
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index