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:           Mon Aug  5 14:50:55 UTC 2024

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

Log Message:
cfitsio: updated to 4.4.1

Version 4.4.1 - Jun 2024

- Removed NOSA license and restored previous license file

Version 4.4.0 - Feb 2024

- Reorganization of helper utility code; added fitsverify
- CMakeLists.txt: Changed install location of cfitsio-targets.cmake
  to conform with the one listed in cfitsio-config.cmake.in (i.e.
  including the extra "cfitsio" subdir of lib/cmake).
- calculator functions that read GTIs do more correct validity
  checking of GTI input files
- fits_insert_rows now works if input table starts with both no rows
  and no columns
- Can now write internal memory files of size > 2^32 directly to a
  gzip-compressed output file.
- Added support for unsigned long long types to fits_update_key.
- Added ability for Windows builds to handle UTF-8 needed for reading
  filenames with non-ASCII characters.
- Added 2-byte int test to speed.c utility.
- Made fix to http file handler to expand the allowed URL length.


To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.52 pkgsrc/devel/cfitsio/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/devel/cfitsio/PLIST
cvs rdiff -u -r1.19 -r1.20 pkgsrc/devel/cfitsio/distinfo
cvs rdiff -u -r1.1 -r1.2 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.51 pkgsrc/devel/cfitsio/Makefile:1.52
--- pkgsrc/devel/cfitsio/Makefile:1.51  Mon Jun 10 10:56:15 2024
+++ pkgsrc/devel/cfitsio/Makefile       Mon Aug  5 14:50:55 2024
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.51 2024/06/10 10:56:15 jperkin Exp $
+# $NetBSD: Makefile,v 1.52 2024/08/05 14:50:55 adam Exp $
 
-DISTNAME=      cfitsio-4.2.0
-PKGREVISION=   4
+DISTNAME=      cfitsio-4.4.1
 CATEGORIES=    devel
 MASTER_SITES=  https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/
 
@@ -11,18 +10,16 @@ COMMENT=    FITS (flexible image transport 
 # similar; no copyright claim.
 LICENSE=       isc
 
-USE_LANGUAGES=         c # fortran
+USE_LANGUAGES=         c
 USE_LIBTOOL=           yes
 GNU_CONFIGURE=         yes
-PKGCONFIG_OVERRIDE+=   cfitsio.pc.in
-
 # Does not detect pkgsrc zlib correctly.
 CONFIGURE_ARGS+=       --without-zlib-check
+PKGCONFIG_OVERRIDE+=   cfitsio.pc.in
 
 INSTALLATION_DIRS=     include lib lib/pkgconfig share/doc/cfitsio
 
-CFITSIO_DOCS=  cfitsio.pdf cfortran.doc fitsio.pdf fitsio.doc \
-               fpackguide.pdf quick.pdf
+CFITSIO_DOCS=  cfitsio.pdf fitsio.pdf fpackguide.pdf quick.pdf
 
 post-install:
        cd ${WRKSRC}/docs && \

Index: pkgsrc/devel/cfitsio/PLIST
diff -u pkgsrc/devel/cfitsio/PLIST:1.10 pkgsrc/devel/cfitsio/PLIST:1.11
--- pkgsrc/devel/cfitsio/PLIST:1.10     Sat Nov 23 06:58:14 2019
+++ pkgsrc/devel/cfitsio/PLIST  Mon Aug  5 14:50:55 2024
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2019/11/23 06:58:14 mef Exp $
+@comment $NetBSD: PLIST,v 1.11 2024/08/05 14:50:55 adam Exp $
 include/drvrsmem.h
 include/fitsio.h
 include/fitsio2.h
@@ -6,8 +6,6 @@ include/longnam.h
 lib/libcfitsio.la
 lib/pkgconfig/cfitsio.pc
 share/doc/cfitsio/cfitsio.pdf
-share/doc/cfitsio/cfortran.doc
-share/doc/cfitsio/fitsio.doc
 share/doc/cfitsio/fitsio.pdf
 share/doc/cfitsio/fpackguide.pdf
 share/doc/cfitsio/quick.pdf

Index: pkgsrc/devel/cfitsio/distinfo
diff -u pkgsrc/devel/cfitsio/distinfo:1.19 pkgsrc/devel/cfitsio/distinfo:1.20
--- pkgsrc/devel/cfitsio/distinfo:1.19  Sat Jul 22 10:11:02 2023
+++ pkgsrc/devel/cfitsio/distinfo       Mon Aug  5 14:50:55 2024
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.19 2023/07/22 10:11:02 adam Exp $
+$NetBSD: distinfo,v 1.20 2024/08/05 14:50:55 adam Exp $
 
-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
+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
 SHA1 (patch-cfortran.h) = 761aedc2ae885c119ac2726ba89aaa7c193a8834

Index: pkgsrc/devel/cfitsio/patches/patch-Makefile.in
diff -u pkgsrc/devel/cfitsio/patches/patch-Makefile.in:1.1 pkgsrc/devel/cfitsio/patches/patch-Makefile.in:1.2
--- pkgsrc/devel/cfitsio/patches/patch-Makefile.in:1.1  Sat Jul 22 10:11:02 2023
+++ pkgsrc/devel/cfitsio/patches/patch-Makefile.in      Mon Aug  5 14:50:55 2024
@@ -1,10 +1,10 @@
-$NetBSD: patch-Makefile.in,v 1.1 2023/07/22 10:11:02 adam Exp $
+$NetBSD: patch-Makefile.in,v 1.2 2024/08/05 14:50:55 adam Exp $
 
 Use libtool.
 
---- Makefile.in.orig   2022-10-31 18:40:23.000000000 +0000
+--- Makefile.in.orig   2024-06-17 15:47:47.000000000 +0000
 +++ Makefile.in
-@@ -38,13 +38,15 @@ SHELL =            /bin/sh
+@@ -39,13 +39,15 @@ SHELL =            /bin/sh
  ARCHIVE =     @ARCHIVE@
  RANLIB =      @RANLIB@
  CC =          @CC@
@@ -21,7 +21,7 @@ Use libtool.
  LIBS =                @LIBS@
  LIBS_CURL =   @LIBS_CURL@
  FLEX =                flex
-@@ -93,11 +95,11 @@ all:
+@@ -94,11 +96,11 @@ all:
  all-nofitsio:
                ${MAKE} stand_alone "FITSIO_SRC="
  
@@ -37,7 +37,7 @@ Use libtool.
  
  shared: lib${PACKAGE}${SHLIB_SUFFIX}
  
-@@ -108,23 +110,15 @@ lib${PACKAGE}${SHLIB_SUFFIX}: ${OBJECTS}
+@@ -109,23 +111,15 @@ lib${PACKAGE}${SHLIB_SUFFIX}: ${OBJECTS}
                        ln -sf ${CFITSIO_SHLIB_SONAME} $@; \
                fi
  
@@ -66,52 +66,57 @@ Use libtool.
                    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}
+@@ -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}
  
- # Tested with bison 3.8 and flex 2.6.4
+ # eval: ==================================================================



Home | Main Index | Thread Index | Old Index