pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/devel/cfitsio



Module Name:    pkgsrc
Committed By:   adam
Date:           Sat Feb 14 18:27:36 UTC 2026

Modified Files:
        pkgsrc/devel/cfitsio: Makefile PLIST distinfo
        pkgsrc/devel/cfitsio/patches: patch-Makefile.in

Log Message:
cfitsio: updated to 4.6.3

Version 4.6.3 - Sep 2025

- For greater C23 compatibility, updated cfortran.h file and
  removed old-style function declarations.

- Cleanup of multiple compiler warnings.  Our thanks to petesmc for
  help with this.

- Updated 'speed' utility to use higher precision total time.

- Fixes for FreeBSD and OpenBSD build issues. Our thanks to Diab
  Jerius.

- Added RPM support file cfitsio.spec, and packaging helper file
  ax_cfitsio.m4. Our thanks to Richard Mathar for these.

- Added files portfile.cmake and vcpkg.json.  Our thanks to
  D. Partridge for these.

- Fixed possible memory leaks in certain error exit conditions.
  Our thanks to petesmc.

- Fix to minor truncation error in ffgthd.


To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 pkgsrc/devel/cfitsio/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/devel/cfitsio/PLIST
cvs rdiff -u -r1.20 -r1.21 pkgsrc/devel/cfitsio/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/cfitsio/patches/patch-Makefile.in

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.60 pkgsrc/devel/cfitsio/Makefile:1.61
--- pkgsrc/devel/cfitsio/Makefile:1.60  Fri Feb  6 10:04:27 2026
+++ pkgsrc/devel/cfitsio/Makefile       Sat Feb 14 18:27:35 2026
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.60 2026/02/06 10:04:27 wiz Exp $
+# $NetBSD: Makefile,v 1.61 2026/02/14 18:27:35 adam Exp $
 
-DISTNAME=      cfitsio-4.4.1
-PKGREVISION=   8
+DISTNAME=      cfitsio-4.6.3
 CATEGORIES=    devel
 MASTER_SITES=  https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/
 
@@ -14,6 +13,8 @@ LICENSE=      isc
 USE_LANGUAGES=         c
 USE_LIBTOOL=           yes
 GNU_CONFIGURE=         yes
+CONFIGURE_ARGS+=       --with-bzip2
+CONFIGURE_ARGS+=       --without-fortran
 # Does not detect pkgsrc zlib correctly.
 CONFIGURE_ARGS+=       --without-zlib-check
 PKGCONFIG_OVERRIDE+=   cfitsio.pc.in
@@ -26,6 +27,7 @@ post-install:
        cd ${WRKSRC}/docs && \
        ${INSTALL_DATA} ${CFITSIO_DOCS} ${DESTDIR}${PREFIX}/share/doc/cfitsio
 
+.include "../../archivers/bzip2/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/cfitsio/PLIST
diff -u pkgsrc/devel/cfitsio/PLIST:1.11 pkgsrc/devel/cfitsio/PLIST:1.12
--- pkgsrc/devel/cfitsio/PLIST:1.11     Mon Aug  5 14:50:55 2024
+++ pkgsrc/devel/cfitsio/PLIST  Sat Feb 14 18:27:35 2026
@@ -1,8 +1,19 @@
-@comment $NetBSD: PLIST,v 1.11 2024/08/05 14:50:55 adam Exp $
+@comment $NetBSD: PLIST,v 1.12 2026/02/14 18:27:35 adam Exp $
+bin/cookbook
+bin/fitscopy
+bin/fitsverify
+bin/fpack
+bin/funpack
+bin/imcopy
+bin/smem
+bin/speed
+include/cfortran.h
 include/drvrsmem.h
+include/f77_wrap.h
 include/fitsio.h
 include/fitsio2.h
 include/longnam.h
+include/region.h
 lib/libcfitsio.la
 lib/pkgconfig/cfitsio.pc
 share/doc/cfitsio/cfitsio.pdf

Index: pkgsrc/devel/cfitsio/distinfo
diff -u pkgsrc/devel/cfitsio/distinfo:1.20 pkgsrc/devel/cfitsio/distinfo:1.21
--- pkgsrc/devel/cfitsio/distinfo:1.20  Mon Aug  5 14:50:55 2024
+++ pkgsrc/devel/cfitsio/distinfo       Sat Feb 14 18:27:35 2026
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.20 2024/08/05 14:50:55 adam Exp $
+$NetBSD: distinfo,v 1.21 2026/02/14 18:27:35 adam Exp $
 
-BLAKE2s (cfitsio-4.4.1.tar.gz) = e5a3b9d878708168dd9e1ef74edda48c903680024bd7e7cabb36c223e786995d
-SHA512 (cfitsio-4.4.1.tar.gz) = a49e4e09a2e5f6e0ae823a68f02b3f6285cf3e0af66c9a1f8dadcd2867fa83c17fd27e446e8e5af9374ff2dc7b7a18334663ce977a1691c4ed4ced14d33232b7
-Size (cfitsio-4.4.1.tar.gz) = 4308170 bytes
-SHA1 (patch-Makefile.in) = 171e71686b89bf7d3d0d569dc4b628c99c816ede
+BLAKE2s (cfitsio-4.6.3.tar.gz) = 2b046fe4912e486ec565a14987d1718f441e9b3fbed1f69c193aa12ec13f1a01
+SHA512 (cfitsio-4.6.3.tar.gz) = e6bbfa2dcb8c54a1d1eed663c6443ea9ffe6b49ae8876ce64347446cae1c64c53060d5088711feaa08d3d20bdb9861f7d85b8d899cd0b78e59037272c62a1dd9
+Size (cfitsio-4.6.3.tar.gz) = 4661924 bytes
+SHA1 (patch-Makefile.in) = eebc6d7f99a8ebecf73241318803aa9635f2c814
 SHA1 (patch-cfortran.h) = 761aedc2ae885c119ac2726ba89aaa7c193a8834

Index: pkgsrc/devel/cfitsio/patches/patch-Makefile.in
diff -u pkgsrc/devel/cfitsio/patches/patch-Makefile.in:1.2 pkgsrc/devel/cfitsio/patches/patch-Makefile.in:1.3
--- pkgsrc/devel/cfitsio/patches/patch-Makefile.in:1.2  Mon Aug  5 14:50:55 2024
+++ pkgsrc/devel/cfitsio/patches/patch-Makefile.in      Sat Feb 14 18:27:35 2026
@@ -1,122 +1,15 @@
-$NetBSD: patch-Makefile.in,v 1.2 2024/08/05 14:50:55 adam Exp $
+$NetBSD: patch-Makefile.in,v 1.3 2026/02/14 18:27:35 adam Exp $
 
-Use libtool.
+Skip additional symlink.
 
---- Makefile.in.orig   2024-06-17 15:47:47.000000000 +0000
+--- Makefile.in.orig   2026-02-13 12:33:21.815209350 +0000
 +++ Makefile.in
-@@ -39,13 +39,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
-@@ -94,11 +96,11 @@ all:
- all-nofitsio:
-               ${MAKE} stand_alone "FITSIO_SRC="
+@@ -1980,7 +1980,7 @@ install-dvi-am:
  
--stand_alone:  lib${PACKAGE}.a shared
-+stand_alone:  lib${PACKAGE}.la
+ install-exec-am: install-binPROGRAMS install-libLTLIBRARIES
+       @$(NORMAL_INSTALL)
+-      $(MAKE) $(AM_MAKEFLAGS) install-exec-hook
++      $(MAKE) $(AM_MAKEFLAGS)
+ install-html: install-html-am
  
--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}
- 
-@@ -109,23 +111,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
- 
-@@ -168,34 +162,34 @@ utilities/fvrf_key.o: utilities/fvrf_key
- utilities/fvrf_misc.o: utilities/fvrf_misc.c
-               ${CC} -c -I. -I./utilities -DSTANDALONE $< -o $@
- 
--fitsverify:   lib${PACKAGE}${SHLIB_SUFFIX} ${OBJECTS} ${FVERIFY_OBJ}
--              ${CC} ${LDFLAGS_BIN} -o $@ ${FVERIFY_OBJ} -L. -l${PACKAGE} -lm ${LIBS}
-+fitsverify:   lib${PACKAGE}.la ${OBJECTS} ${FVERIFY_OBJ}
-+              ${LD} ${LDFLAGS_BIN} -o $@ ${FVERIFY_OBJ} -L. -l${PACKAGE} -lm ${LIBS}
- 
--fpack:                utilities/fpack.o utilities/fpackutil.o lib${PACKAGE}${SHLIB_SUFFIX} ${OBJECTS}
--              ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ $< utilities/fpackutil.o -L. -l${PACKAGE} -lm ${LIBS}
-+fpack:                utilities/fpack.o utilities/fpackutil.o lib${PACKAGE}.la ${OBJECTS}
-+              ${LD} ${LDFLAGS_BIN} ${DEFS} -o $@ $< utilities/fpackutil.o -L. -l${PACKAGE} -lm ${LIBS}
- 
--funpack:      utilities/funpack.o utilities/fpackutil.o lib${PACKAGE}${SHLIB_SUFFIX} ${OBJECTS}
--              ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ $< utilities/fpackutil.o -L. -l${PACKAGE} -lm ${LIBS}
-+funpack:      utilities/funpack.o utilities/fpackutil.o lib${PACKAGE}.la ${OBJECTS}
-+              ${LD} ${LDFLAGS_BIN} ${DEFS} -o $@ $< utilities/fpackutil.o -L. -l${PACKAGE} -lm ${LIBS}
- 
--smem:         utilities/smem.o lib${PACKAGE}${SHLIB_SUFFIX} ${OBJECTS}
--              ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ $< -L. -l${PACKAGE} -lm
-+smem:         utilities/smem.o lib${PACKAGE}.la ${OBJECTS}
-+              ${LD} ${LDFLAGS_BIN} ${DEFS} -o $@ $< -L. -l${PACKAGE} -lm
- 
--testprog:     utilities/testprog.o lib${PACKAGE}${SHLIB_SUFFIX} ${OBJECTS}
--              ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ $< -L. -l${PACKAGE} -lm ${LIBS}
-+testprog:     utilities/testprog.o lib${PACKAGE}.la ${OBJECTS}
-+              ${LD} ${LDFLAGS_BIN} ${DEFS} -o $@ $< -L. -l${PACKAGE} -lm ${LIBS}
- 
--fitscopy:     utilities/fitscopy.o lib${PACKAGE}${SHLIB_SUFFIX} ${OBJECTS}
--              ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ $< -L. -l${PACKAGE} -lm ${LIBS}
-+fitscopy:     utilities/fitscopy.o lib${PACKAGE}.la ${OBJECTS}
-+              ${LD} ${LDFLAGS_BIN} ${DEFS} -o $@ $< -L. -l${PACKAGE} -lm ${LIBS}
- 
--speed:                utilities/speed.o lib${PACKAGE}${SHLIB_SUFFIX} ${OBJECTS}
--              ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ $< -L. -l${PACKAGE} -lm ${LIBS}
-+speed:                utilities/speed.o lib${PACKAGE}.la ${OBJECTS}
-+              ${LD} ${LDFLAGS_BIN} ${DEFS} -o $@ $< -L. -l${PACKAGE} -lm ${LIBS}
- 
--imcopy:               utilities/imcopy.o lib${PACKAGE}${SHLIB_SUFFIX} ${OBJECTS}
--              ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ $< -L. -l${PACKAGE} -lm ${LIBS}
-+imcopy:               utilities/imcopy.o lib${PACKAGE}.la ${OBJECTS}
-+              ${LD} ${LDFLAGS_BIN} ${DEFS} -o $@ $< -L. -l${PACKAGE} -lm ${LIBS}
- 
--cookbook:     utilities/cookbook.o lib${PACKAGE}${SHLIB_SUFFIX} ${OBJECTS}
--              ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ $< -L. -l${PACKAGE} -lm ${LIBS}
-+cookbook:     utilities/cookbook.o lib${PACKAGE}.la ${OBJECTS}
-+              ${LD} ${LDFLAGS_BIN} ${DEFS} -o $@ $< -L. -l${PACKAGE} -lm ${LIBS}
- 
--testf77:      utilities/testf77.o lib${PACKAGE}${SHLIB_SUFFIX} ${OBJECTS}
-+testf77:      utilities/testf77.o lib${PACKAGE}.la ${OBJECTS}
-               ${FC} ${LDFLAGS_BIN} -o $@ $< -L. -l${PACKAGE} -lm ${LIBS}
- 
- # eval: ==================================================================
+ install-html-am:



Home | Main Index | Thread Index | Old Index