Index: head/astro/gnuastro/Makefile =================================================================== --- head/astro/gnuastro/Makefile (revision 536969) +++ head/astro/gnuastro/Makefile (revision 536970) @@ -1,39 +1,43 @@ # Created by: Alexey Dokuchaev # $FreeBSD$ PORTNAME= gnuastro -PORTVERSION= 0.11 +PORTVERSION= 0.12 CATEGORIES= astro MASTER_SITES= GNU MAINTAINER= danfe@FreeBSD.org COMMENT= GNU astronomy utilities and library LICENSE= GPLv3+ LIB_DEPENDS= libcfitsio.so:astro/cfitsio \ libwcs.so:astro/wcslib \ libcurl.so:ftp/curl \ libgsl.so:math/gsl \ libpng.so:graphics/png \ libtiff.so:graphics/tiff USES= gmake jpeg libtool:build localbase tar:lz GNU_CONFIGURE= yes USE_LDCONFIG= yes TEST_TARGET= check INFO= ${PORTNAME} PORTDOCS= AUTHORS ChangeLog NEWS README THANKS OPTIONS_DEFINE= DOCS + +post-patch: + @${REINPLACE_CMD} -e 's,cflags_add="-O3",:,' \ + ${WRKSRC}/configure post-install: @${FIND} ${STAGEDIR}${PREFIX}/etc -name \*.conf \ -exec ${MV} '{}' '{}.sample' \; post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} .include Index: head/astro/gnuastro/distinfo =================================================================== --- head/astro/gnuastro/distinfo (revision 536969) +++ head/astro/gnuastro/distinfo (revision 536970) @@ -1,3 +1,3 @@ -TIMESTAMP = 1574693798 -SHA256 (gnuastro-0.11.tar.lz) = 7bcc22311e69db17351a476df01dfd31009b0db06e2b6d525338efb3b0603e30 -SIZE (gnuastro-0.11.tar.lz) = 3490088 +TIMESTAMP = 1589989283 +SHA256 (gnuastro-0.12.tar.lz) = ced7ab6d3dca6913fc8df649070dc3a496b67e975b14e57a64e81c2c0e0bf37a +SIZE (gnuastro-0.12.tar.lz) = 3533517 Index: head/astro/gnuastro/files/patch-bin_fits_keywords.c =================================================================== --- head/astro/gnuastro/files/patch-bin_fits_keywords.c (nonexistent) +++ head/astro/gnuastro/files/patch-bin_fits_keywords.c (revision 536970) @@ -0,0 +1,11 @@ +--- bin/fits/keywords.c.orig 2020-05-15 16:58:42 UTC ++++ bin/fits/keywords.c +@@ -413,6 +413,8 @@ keywords_date_to_seconds(struct fitsparams *p, fitsfil + /* Return the number of seconds (and subseconds) that it corresponds + to. */ + seconds=gal_fits_key_date_to_seconds(fitsdate, &subsecstr, &subsec); ++ if(seconds==GAL_BLANK_SIZE_T) ++ error(EXIT_FAILURE, 0, "the time string couldn't be interpretted"); + + /* Print the result (for the sub-seconds, print everything after the */ + if( !p->cp.quiet ) Property changes on: head/astro/gnuastro/files/patch-bin_fits_keywords.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/astro/gnuastro/files/patch-lib_fits.c =================================================================== --- head/astro/gnuastro/files/patch-lib_fits.c (nonexistent) +++ head/astro/gnuastro/files/patch-lib_fits.c (revision 536970) @@ -0,0 +1,41 @@ +--- lib/fits.c.orig 2020-05-15 16:58:42 UTC ++++ lib/fits.c +@@ -1023,6 +1023,7 @@ gal_fits_key_date_to_seconds(char *fitsdate, char **su + time_t t; + char *tmp; + struct tm tp; ++ size_t seconds; + void *outptr=subsec; + + /* Fill in the 'tp' elements with values read from the string. */ +@@ -1044,14 +1045,23 @@ gal_fits_key_date_to_seconds(char *fitsdate, char **su + tmp); + } + +- /* Convert the 'tm' structure to 'time_t'. Note that the system's +- timezone and daylight saving need to be subtracted from the output of +- 'mktime'. Otherwise the result will be different on different +- host-system timezones (which is not what we want here: bug #57995). */ +- t=mktime(&tp)-timezone-daylight; ++ /* Convert the contents of the 'tm' structure to 'time_t' (a positive ++ integer) with 'mktime'. Note that by design, the system's timezone is ++ included in the returned value of 'mktime' (leading to situations like ++ bug #57995). But it writes the given time's timezone (number of ++ seconds ahead of UTC) in the 'tm_gmtoff' element of its input. + +- /* Return the value and set the output pointer. */ +- return (size_t)t; ++ IMPORTANT NOTE: the timezone that is calculated by 'mktime' (in ++ 'tp.tm_gmtoff') belongs to the time that is already within 'tp' (this ++ is exactly what we want!). So for example when daylight saving is ++ activated at run-time, but at the time inside 'tp', there was no ++ daylight saving, the value of 'tp.tm_gmtoff' will be different from ++ the 'timezone' global variable. */ ++ t=mktime(&tp); ++ ++ /* Calculate the seconds and return it. */ ++ seconds = (t == (time_t)(-1)) ? GAL_BLANK_SIZE_T : (t+tp.tm_gmtoff); ++ return seconds; + } + + Property changes on: head/astro/gnuastro/files/patch-lib_fits.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/astro/gnuastro/pkg-plist =================================================================== --- head/astro/gnuastro/pkg-plist (revision 536969) +++ head/astro/gnuastro/pkg-plist (revision 536970) @@ -1,109 +1,110 @@ bin/astarithmetic bin/astbuildprog bin/astconvertt bin/astconvolve bin/astcosmiccal bin/astcrop bin/astfits bin/astmatch bin/astmkcatalog bin/astmknoise bin/astmkprof bin/astnoisechisel bin/astscript-sort-by-night bin/astsegment bin/aststatistics bin/asttable bin/astwarp @sample etc/astarithmetic.conf.sample @sample etc/astbuildprog.conf.sample @sample etc/astconvertt.conf.sample @sample etc/astconvolve.conf.sample @sample etc/astcosmiccal.conf.sample @sample etc/astcrop.conf.sample @sample etc/astfits.conf.sample @sample etc/astmatch.conf.sample @sample etc/astmkcatalog.conf.sample @sample etc/astmknoise.conf.sample @sample etc/astmkprof-3d.conf.sample @sample etc/astmkprof.conf.sample @sample etc/astnoisechisel.conf.sample @sample etc/astsegment.conf.sample @sample etc/aststatistics.conf.sample @sample etc/asttable.conf.sample @sample etc/astwarp.conf.sample @sample etc/gnuastro.conf.sample include/gnuastro/arithmetic.h include/gnuastro/array.h include/gnuastro/binary.h include/gnuastro/blank.h include/gnuastro/box.h include/gnuastro/config.h include/gnuastro/convolve.h include/gnuastro/cosmology.h include/gnuastro/data.h include/gnuastro/dimension.h include/gnuastro/eps.h include/gnuastro/fits.h include/gnuastro/git.h include/gnuastro/interpolate.h include/gnuastro/jpeg.h include/gnuastro/label.h include/gnuastro/list.h include/gnuastro/match.h include/gnuastro/pdf.h include/gnuastro/permutation.h include/gnuastro/pointer.h include/gnuastro/polygon.h include/gnuastro/qsort.h include/gnuastro/speclines.h include/gnuastro/statistics.h include/gnuastro/table.h include/gnuastro/threads.h include/gnuastro/tiff.h include/gnuastro/tile.h include/gnuastro/txt.h include/gnuastro/type.h +include/gnuastro/units.h include/gnuastro/wcs.h lib/libgnuastro.a lib/libgnuastro.so -lib/libgnuastro.so.9 -lib/libgnuastro.so.9.0.0 +lib/libgnuastro.so.10 +lib/libgnuastro.so.10.0.0 libdata/pkgconfig/gnuastro.pc man/man1/astarithmetic.1.gz man/man1/astbuildprog.1.gz man/man1/astconvertt.1.gz man/man1/astconvolve.1.gz man/man1/astcosmiccal.1.gz man/man1/astcrop.1.gz man/man1/astfits.1.gz man/man1/astmatch.1.gz man/man1/astmkcatalog.1.gz man/man1/astmknoise.1.gz man/man1/astmkprof.1.gz man/man1/astnoisechisel.1.gz man/man1/astscript-sort-by-night.1.gz man/man1/astsegment.1.gz man/man1/aststatistics.1.gz man/man1/asttable.1.gz man/man1/astwarp.1.gz share/info/gnuastro-figures/README share/info/gnuastro-figures/epicycles.eps share/info/gnuastro-figures/epicycles.png share/info/gnuastro-figures/epicycles.txt share/info/gnuastro-figures/flatplane.eps share/info/gnuastro-figures/flatplane.pdf share/info/gnuastro-figures/flatplane.png share/info/gnuastro-figures/flatplane.txt share/info/gnuastro-figures/iandtime.eps share/info/gnuastro-figures/iandtime.pdf share/info/gnuastro-figures/iandtime.png share/info/gnuastro-figures/iandtime.txt share/info/gnuastro-figures/samplingfreq.eps share/info/gnuastro-figures/samplingfreq.pdf share/info/gnuastro-figures/samplingfreq.png share/info/gnuastro-figures/samplingfreq.txt share/info/gnuastro-figures/sphereandplane.eps share/info/gnuastro-figures/sphereandplane.pdf share/info/gnuastro-figures/sphereandplane.png share/info/gnuastro-figures/sphereandplane.txt