diff --git a/10.9-libcxx/stable/main/finkinfo/libs/libcfitsio10-shlibs.info b/10.9-libcxx/stable/main/finkinfo/libs/libcfitsio10-shlibs.info index a17deb25ca..8c7a256e4d 100644 --- a/10.9-libcxx/stable/main/finkinfo/libs/libcfitsio10-shlibs.info +++ b/10.9-libcxx/stable/main/finkinfo/libs/libcfitsio10-shlibs.info @@ -1,5 +1,5 @@ Package: libcfitsio10-shlibs -Version: 4.3.0 +Version: 4.6.2 Revision: 1 Description: FITS file subroutines library License: GPL @@ -9,29 +9,22 @@ BuildDepends: << fink (>= 0.32), fink-package-precedence, libcurl4, - gcc12-compiler + gcc14-compiler << Depends: << bzip2-shlibs, libcurl4-shlibs << Source: http://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/cfitsio-%v.tar.gz -Source-Checksum: SHA256(fdadc01d09cf9f54253802c5ec87eb10de51ce4130411415ae88c30940621b8b) -Source2: mirror:debian:pool/main/c/cfitsio/cfitsio_4.3.0-2.debian.tar.xz -Source2-Checksum: SHA256(b5a591c4a2f90976f353b2fae73d974fdabb936accd1923f1cebc59b51e8ae9d) -PatchFile: %n.patch -PatchFile-MD5: b12c12d27e69f68f02b9c82e5b33dbfe -PatchScript: << - patch -p1 < ../debian/patches/06-spelling-errors.diff - patch -p1 < ../debian/patches/10-latex.diff - %{default_script} -<< -ConfigureParams: --with-bzip2 FC=%p/lib/gcc12/bin/gfortran-fsf-12 +Source-Checksum: SHA256(66fd078cc0bea896b0d44b120d46d6805421a5361d3a5ad84d9f397b1b5de2cb) +Source2: mirror:debian:pool/main/c/cfitsio/cfitsio_%v-2.debian.tar.xz +Source2-Checksum: SHA256(94c9c119dcfcd8be53b74a682e14b7641ba215345ff9b9902883e99d11b05332) +ConfigureParams: --with-bzip2 --disable-static FC=%p/lib/gcc14/bin/gfortran-fsf-14 SetCPPFLAGS: -MD CompileScript: << %{default_script} make fitscopy fpack funpack imcopy - fink-package-precedence --depfile-ext='\.d' --prohibit-bdep=cfitsio,libcfitsio8-dev,libcfitsio9-dev,libcfitsio10-dev . + fink-package-precedence --prohibit-bdep=cfitsio,libcfitsio8-dev,libcfitsio9-dev,libcfitsio10-dev . << InfoTest: << TestScript: << @@ -39,7 +32,7 @@ InfoTest: << make testprog || exit 2 # 'make install' would install testprog if that is its name mv testprog testprog.bin - fink-package-precedence --depfile-ext='\.d' --prohibit-bdep=cfitsio,libcfitsio8-dev,libcfitsio9-dev,libcfitsio10-dev . || exit 2 + fink-package-precedence --prohibit-bdep=cfitsio,libcfitsio8-dev,libcfitsio9-dev,libcfitsio10-dev . || exit 2 ./testprog.bin >| testprog.lis diff testprog.{out,lis} DIFF=$(diff -q testprog.{out,lis} | wc -l) @@ -58,8 +51,8 @@ InstallScript: << mkdir -p %i/share/man/man1 install -m 644 ../debian/*.1 %i/share/man/man1 << -DocFiles: README License.txt -Shlibs: %p/lib/libcfitsio.10.dylib 10.0.0 %n (>= 4.3.0-1) +DocFiles: README.MacOS README.md licenses/License.txt +Shlibs: %p/lib/libcfitsio.10.dylib 11.0.0 %n (>= 4.6.2-1) SplitOff: << Package: libcfitsio10-dev Depends: %N (= %v-%r) @@ -79,9 +72,11 @@ SplitOff: << Files: << include lib/libcfitsio.dylib + lib/libcfitsio.10.%v.dylib + lib/libcfitsio.la lib/pkgconfig << - DocFiles: README License.txt + DocFiles: README.MacOS README.md licenses/License.txt << SplitOff2: << Package: cfitsio-bin @@ -94,7 +89,7 @@ SplitOff2: << bin share/man << - DocFiles: README License.txt + DocFiles: README.MacOS README.md licenses/License.txt << Homepage: http://heasarc.gsfc.nasa.gov/docs/software/fitsio/fitsio.html DescDetail: << diff --git a/10.9-libcxx/stable/main/finkinfo/libs/libcfitsio10-shlibs.patch b/10.9-libcxx/stable/main/finkinfo/libs/libcfitsio10-shlibs.patch deleted file mode 100644 index 7d485ba24e..0000000000 --- a/10.9-libcxx/stable/main/finkinfo/libs/libcfitsio10-shlibs.patch +++ /dev/null @@ -1,141 +0,0 @@ -diff -Nurd cfitsio-4.3.0.orig/Makefile.in cfitsio-4.3.0/Makefile.in ---- cfitsio-4.3.0.orig/Makefile.in 2022-11-15 20:29:16.000000000 -0500 -+++ cfitsio-4.3.0/Makefile.in 2023-10-10 23:56:14.000000000 -0400 -@@ -93,7 +93,7 @@ - all-nofitsio: - ${MAKE} stand_alone "FITSIO_SRC=" - --stand_alone: lib${PACKAGE}.a shared -+stand_alone: shared - - lib${PACKAGE}.a: ${OBJECTS} - ${ARCHIVE} $@ ${OBJECTS}; \ -@@ -108,8 +108,8 @@ - ln -sf ${CFITSIO_SHLIB_SONAME} $@; \ - fi - --install: lib${PACKAGE}.a ${INSTALL_DIRS} -- @for lib in lib${PACKAGE}.a lib${PACKAGE}${SHLIB_SUFFIX} \ -+install: ${INSTALL_DIRS} -+ @for lib in lib${PACKAGE}${SHLIB_SUFFIX} \ - ${CFITSIO_SHLIB} ${CFITSIO_SHLIB_SONAME}; do \ - if [ -f $$lib ]; then \ - echo "/bin/rm -f ${CFITSIO_LIB}/$$lib"; \ -@@ -141,32 +141,32 @@ - 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}${SHLIB_SUFFIX} ${OBJECTS} -+ ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o lib${PACKAGE}${SHLIB_SUFFIX} -lm - --testprog: testprog.o lib${PACKAGE}.a ${OBJECTS} -- ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS} -+testprog: testprog.o lib${PACKAGE}${SHLIB_SUFFIX} ${OBJECTS} -+ ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o lib${PACKAGE}${SHLIB_SUFFIX} -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}${SHLIB_SUFFIX} ${OBJECTS} -+ ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o fpackutil.o lib${PACKAGE}${SHLIB_SUFFIX} -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}${SHLIB_SUFFIX} ${OBJECTS} -+ ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o fpackutil.o lib${PACKAGE}${SHLIB_SUFFIX} -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}${SHLIB_SUFFIX} ${OBJECTS} -+ ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o lib${PACKAGE}${SHLIB_SUFFIX} -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}${SHLIB_SUFFIX} ${OBJECTS} -+ ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o lib${PACKAGE}${SHLIB_SUFFIX} -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}${SHLIB_SUFFIX} ${OBJECTS} -+ ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o lib${PACKAGE}${SHLIB_SUFFIX} -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}${SHLIB_SUFFIX} ${OBJECTS} -+ ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o lib${PACKAGE}${SHLIB_SUFFIX} -lm ${LIBS} - - testf77: testf77.o lib${PACKAGE}.a ${OBJECTS} -- ${FC} ${LDFLAGS_BIN} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS} -+ ${FC} ${LDFLAGS_BIN} -o $@ ${@}.o lib${PACKAGE}${SHLIB_SUFFIX} -lm ${LIBS} - - # Tested with bison 3.8 and flex 2.6.4 - eval: # Rebuild eval_* files from flex/bison source -diff -Nurd cfitsio-4.3.0.orig/configure cfitsio-4.3.0/configure ---- cfitsio-4.3.0.orig/configure 2023-07-23 22:59:25.000000000 -0400 -+++ cfitsio-4.3.0/configure 2023-10-11 00:20:15.000000000 -0400 -@@ -3994,7 +3994,6 @@ - - #------------------------------------------------------------------------------- - --LDFLAGS="$CFLAGS" - LDFLAGS_BIN="$LDFLAGS" - - if test "x$FC" = "xnone" ; then -@@ -4352,7 +4351,7 @@ - # CFLAGS="$CFLAGS $C_UNIV_SWITCH" - # fi - # LDFLAGS used by utilities: -- LDFLAGS_BIN="$LDFLAGS_BIN -Wl,-rpath,\${CFITSIO_LIB}" -+# LDFLAGS_BIN="$LDFLAGS_BIN -Wl,-rpath,\${CFITSIO_LIB}" - ;; - esac - # For large file support (but may break Absoft compilers): -@@ -4538,16 +4537,7 @@ - SHLIB_SUFFIX=".dylib" - CFITSIO_SHLIB="lib\${PACKAGE}.\${CFITSIO_SONAME}.\${CFITSIO_MAJOR}.\${CFITSIO_MINOR}.\${CFITSIO_MICRO}\${SHLIB_SUFFIX}" - CFITSIO_SHLIB_SONAME="lib\${PACKAGE}.\${CFITSIO_SONAME}\${SHLIB_SUFFIX}" -- case $host in -- *darwin[56789]*) -- SHLIB_LD="$CC -dynamiclib -install_name lib\${PACKAGE}.\${CFITSIO_SONAME}\${SHLIB_SUFFIX} -compatibility_version \${CFITSIO_SONAME} -current_version \${CFITSIO_SONAME}.\${CFITSIO_MAJOR}.\${CFITSIO_MINOR}.\${CFITSIO_MICRO}" -- ;; -- *) -- # Build 'Universal' binaries (i386 & x86_64 architectures) and -- # use rpath token on Darwin 10.x or newer: -- SHLIB_LD="$CC -dynamiclib $C_UNIV_SWITCH -headerpad_max_install_names -install_name @rpath/lib\${PACKAGE}.\${CFITSIO_SONAME}\${SHLIB_SUFFIX} -compatibility_version \${CFITSIO_SONAME} -current_version \${CFITSIO_SONAME}.\${CFITSIO_MAJOR}.\${CFITSIO_MINOR}.\${CFITSIO_MICRO}" -- ;; -- esac -+ SHLIB_LD="$CC -dynamiclib -headerpad_max_install_names -install_name lib\${PACKAGE}.\${CFITSIO_SONAME}\${SHLIB_SUFFIX} -compatibility_version \${CFITSIO_SONAME} -current_version \${CFITSIO_SONAME}.\${CFITSIO_MAJOR}.\${CFITSIO_MINOR}.\${CFITSIO_MICRO}" - - lhea_shlib_cflags="-fPIC -fno-common" - ;; -@@ -4601,7 +4591,6 @@ - CURL_LIB_PATH="" - if test "x$ADD_CURL" = xyes; then - # Use curl-config to get compiler & linker flags, if available. -- # (and prefer /usr/bin/curl-config) - # Extract the first word of "curl-config", so it can be a program name with args. - set dummy curl-config; ac_word=$2 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -@@ -4616,7 +4605,7 @@ - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in /usr/bin$PATH_SEPARATOR$PATH -+for as_dir in $PATH - do - IFS=$as_save_IFS - case $as_dir in #((( -@@ -4653,12 +4642,6 @@ - if test "x$CURL_LIB" != x; then - LIBS_CURL="$CURL_LIB" - # Mac OS: For third-party curl-config, acquire an rpath: -- if test `echo $host | grep -c apple-darwin` -ne 0 -a `echo $CURL_LIB | grep -c "^-L"` -gt 0; then -- CURL_LIB_PATH=`echo ${CURL_LIB} | tr " " "\012" | grep "^-L" | tr "\012" " " | sed 's:-L::' | sed 's: $::'` -- if test "x$CURL_LIB_PATH" != x; then -- LIBS_CURL="-Wl,-rpath,$CURL_LIB_PATH $CURL_LIB" -- fi -- fi - if test `echo $host | grep -c cygwin` -ne 0 -o `echo $host | grep -c mingw32` -ne 0; then - LIBS="$CURL_LIB $LIBS" - fi