diff --git a/astro/astrometry/Makefile b/astro/astrometry/Makefile index 9239ac69832e..2cf63ca17005 100644 --- a/astro/astrometry/Makefile +++ b/astro/astrometry/Makefile @@ -1,80 +1,79 @@ PORTNAME= astrometry -PORTVERSION= 0.89 -PORTREVISION= 3 +PORTVERSION= 0.91 CATEGORIES= astro MASTER_SITES= http://astrometry.net/downloads/ DISTNAME= ${PORTNAME}.net-${PORTVERSION} MAINTAINER= rhurlin@FreeBSD.org COMMENT= Astronomic calibration service LICENSE= GPLv3+ BROKEN_armv6= fails to link: os-features-test.c:10: undefined symbol 'canonicalize_file_name' BROKEN_armv7= fails to link: os-features-test.c:10: undefined symbol 'canonicalize_file_name' BUILD_DEPENDS= ${PYNUMPY} LIB_DEPENDS= libcairo.so:graphics/cairo \ libcfitsio.so:astro/cfitsio \ libgsl.so:math/gsl \ libpng.so:graphics/png \ libnetpbm.so:graphics/netpbm \ libwcs.so:astro/wcslib RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}astropy>0:astro/py-astropy@${PY_FLAVOR} \ ${PYNUMPY} USES= gmake jpeg localbase pkgconfig python shebangfix USE_LDCONFIG= yes -SHEBANG_FILES= bin/* sdss/*.py solver/*.py util/[!c]*.py +SHEBANG_FILES= bin/* plot/plotann.py sdss/*.py solver/*.py util/[!c]*.py MAKE_ARGS= NETPBM_INC="-I${LOCALBASE}/include/netpbm" \ NETPBM_LIB="-L${LOCALBASE}/lib -lnetpbm" \ SYSTEM_GSL=yes MAKE_ENV= INSTALL_DIR=${STAGEDIR}${PREFIX} \ DATA_INSTALL_DIR=${STAGEDIR}${DATADIR} \ DOC_INSTALL_DIR=${STAGEDIR}${DOCSDIR} \ EXAMPLE_INSTALL_DIR=${STAGEDIR}${EXAMPLESDIR} \ MAN1_INSTALL_DIR=${STAGEDIR}${PREFIX}/man/man1 \ PY_BASE_INSTALL_DIR=${STAGEDIR}${PYTHON_LIBDIR}/astrometry \ PYTHON=${PYTHON_CMD} PYTHON_SCRIPT=${PYTHON_CMD} MAKE_JOBS_UNSAFE= yes ALL_TARGET= all extra LDFLAGS+= -lz CONFLICTS_INSTALL= afni p5-Text-RecordParser # bin/imstat bin/tabmerge MANDIRS= ${MANPREFIX}/man/man1 SUB_FILES= pkg-message OPTIONS_DEFINE= DOCS EXAMPLES OPTIONS_DEFAULT= EXAMPLES FILES= an-fitstopnm an-pnmtofits astrometry-engine \ build-astrometry-index downsample-fits fit-wcs \ fits-column-merge fits-flip-endian fits-guess-scale \ fitscopy fitsgetext fitsverify get-healpix get-wcs \ hpsplit image2xy imarith imcopy imstat listhead liststruc \ modhead new-wcs pad-file plot-constellations \ plotquad plotxy query-starkd solve-field startree \ subtable tablist tabmerge tabsort wcs-grab wcs-match \ wcs-pv2sip wcs-rd2xy wcs-resample wcs-to-tan wcs-xy2rd \ wcsinfo post-install: .for file in ${FILES} ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${file} .endfor ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libastrometry.so @${REINPLACE_CMD} -i '' \ -e 's|${STAGEDIR}/usr/local/data|${DATADIR}|' \ ${STAGEDIR}${PREFIX}/etc/${PORTNAME}.cfg @${RMDIR} ${STAGEDIR}${PREFIX}/data @${MKDIR} ${STAGEDIR}${DATADIR}/sdss @${MKDIR} ${STAGEDIR}${DATADIR}/solver @${MKDIR} ${STAGEDIR}${DATADIR}/catalogs ${INSTALL_DATA} ${WRKSRC}/sdss/testdata/*.fit* ${STAGEDIR}${DATADIR}/sdss ${INSTALL_DATA} ${WRKSRC}/solver/index-9918.fits ${STAGEDIR}${DATADIR}/solver ${INSTALL_DATA} ${WRKSRC}/catalogs/*.fit* ${STAGEDIR}${DATADIR}/catalogs .include diff --git a/astro/astrometry/distinfo b/astro/astrometry/distinfo index 95665bb0f7dd..511b19fd1da1 100644 --- a/astro/astrometry/distinfo +++ b/astro/astrometry/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1643299821 -SHA256 (astrometry.net-0.89.tar.gz) = 98e955a6f747cde06904e461df8e09cd58fe14b1ecceb193e3619d0f5fc64acb -SIZE (astrometry.net-0.89.tar.gz) = 11721482 +TIMESTAMP = 1660411922 +SHA256 (astrometry.net-0.91.tar.gz) = 832b7613a2a2974be0fb85b055b395707d10c172846e5cf83573a4e759a83b8e +SIZE (astrometry.net-0.91.tar.gz) = 11724838 diff --git a/astro/astrometry/files/patch-libkd_Makefile b/astro/astrometry/files/patch-libkd_Makefile index dad939fd793a..be75ede9af2a 100644 --- a/astro/astrometry/files/patch-libkd_Makefile +++ b/astro/astrometry/files/patch-libkd_Makefile @@ -1,15 +1,15 @@ ---- libkd/Makefile.orig 2019-04-22 16:25:30 UTC +--- libkd/Makefile.orig 2022-08-03 15:04:41 UTC +++ libkd/Makefile -@@ -136,10 +136,11 @@ install: $(LIBKD) +@@ -138,10 +138,11 @@ install-spherematch: spherematch_c$(PYTHON_SO_EXT) .PHONY: install-spherematch install-spherematch: spherematch_c$(PYTHON_SO_EXT) mkdir -p '$(PY_INSTALL_DIR)' - @for x in spherematch_c$(PYTHON_SO_EXT) spherematch.py __init__.py; do \ + @for x in spherematch.py __init__.py; do \ echo cp $$x '$(PY_INSTALL_DIR)'; \ cp $$x '$(PY_INSTALL_DIR)'; \ done + $(BSD_INSTALL_LIB) spherematch_c$(PYTHON_SO_EXT) '$(PY_INSTALL_DIR)' ### TESTS are great diff --git a/astro/astrometry/files/patch-plot_Makefile b/astro/astrometry/files/patch-plot_Makefile index 879b71c4bc0a..3a308e802e82 100644 --- a/astro/astrometry/files/patch-plot_Makefile +++ b/astro/astrometry/files/patch-plot_Makefile @@ -1,31 +1,31 @@ ---- plot/Makefile.orig 2020-07-16 20:26:35 UTC +--- plot/Makefile.orig 2022-08-03 15:04:41 UTC +++ plot/Makefile -@@ -119,23 +119,24 @@ install: +@@ -105,23 +105,24 @@ install-extra: $(INSTALL_CAIRO_EXECS) PYTHON_EXTRA_INSTALL := plotstuff.py plotstuff_c.py _plotstuff_c$(PYTHON_SO_EXT) install-extra: $(INSTALL_CAIRO_EXECS) - @echo Installing in directory '$(INSTALL_DIR)' + @echo Installing executables in directory '$(INSTALL_DIR)' $(MKDIR) '$(INSTALL_DIR)/bin' @for x in $(INSTALL_CAIRO_EXECS); do \ - echo $(CP) $$x '$(INSTALL_DIR)/bin'; \ - $(CP) $$x '$(INSTALL_DIR)/bin'; \ + echo $(BSD_INSTALL_PROGRAM) $$x '$(INSTALL_DIR)/bin'; \ + $(BSD_INSTALL_PROGRAM) $$x '$(INSTALL_DIR)/bin'; \ done $(MKDIR) '$(INCLUDE_INSTALL_DIR)' @for x in $(PLOT_INSTALL_H); do \ echo $(CP) '$(INCLUDE_DIR)/'$$x '$(INCLUDE_INSTALL_DIR)'; \ $(CP) '$(INCLUDE_DIR)/'$$x '$(INCLUDE_INSTALL_DIR)'; \ done - $(MAKE) $(PYTHON_EXTRA_INSTALL) + $(MAKE) $(PYTHON_EXTRA_INSTALL) _plotstuff_c$(PYTHON_SO_EXT) $(MKDIR) '$(PY_INSTALL_DIR)' @for x in $(PYTHON_EXTRA_INSTALL); do \ echo $(CP) $$x '$(PY_INSTALL_DIR)/'$$x; \ $(CP) $$x '$(PY_INSTALL_DIR)/'$$x; \ done + $(BSD_INSTALL_LIB) _plotstuff_c$(PYTHON_SO_EXT) '$(PY_INSTALL_DIR)' - - $(COMMON)/cairoutils.o: - $(MAKE) -C $(COMMON) cairoutils.o + @for x in $(PYTHON_INSTALL); do \ + echo $(CP) $$x '$(PY_INSTALL_DIR)/'$$x; \ + $(CP) $$x '$(PY_INSTALL_DIR)/'$$x; \ diff --git a/astro/astrometry/pkg-plist b/astro/astrometry/pkg-plist index f314f996e044..30533c19b021 100644 --- a/astro/astrometry/pkg-plist +++ b/astro/astrometry/pkg-plist @@ -1,319 +1,324 @@ bin/an-fitstopnm bin/an-pnmtofits bin/astrometry-engine +bin/augment-xylist bin/build-astrometry-index bin/degtohms bin/downsample-fits bin/fit-wcs bin/fits-column-merge bin/fits-flip-endian bin/fits-guess-scale bin/fitscopy bin/fitsgetext bin/fitsverify bin/get-healpix bin/get-wcs bin/hmstodeg bin/hpsplit bin/image2pnm bin/image2xy bin/imarith bin/imcopy bin/imstat bin/listhead bin/liststruc bin/merge-columns bin/modhead bin/new-wcs bin/pad-file bin/plot-constellations +bin/plotann.py bin/plotquad bin/plotxy bin/query-starkd bin/removelines bin/solve-field bin/startree bin/subtable bin/tablist bin/tabmerge bin/tabsort bin/text2fits bin/uniformize bin/votabletofits bin/wcs-grab bin/wcs-match bin/wcs-pv2sip bin/wcs-rd2xy bin/wcs-resample bin/wcs-to-tan bin/wcs-xy2rd bin/wcsinfo etc/astrometry.cfg include/astrometry/2mass-fits.h include/astrometry/2mass.h include/astrometry/allquads.h include/astrometry/an-bool.h include/astrometry/an-endian.h include/astrometry/an-opts.h include/astrometry/an-thread-pthreads.h include/astrometry/an-thread.h include/astrometry/anqfits.h include/astrometry/anwcs.h include/astrometry/augment-xylist.h include/astrometry/axyfile.h include/astrometry/bl-nl.h include/astrometry/bl-nl.inc include/astrometry/bl-nl.ph include/astrometry/bl-sort.h include/astrometry/bl.h include/astrometry/bl.inc include/astrometry/bl.ph include/astrometry/brightstars.h include/astrometry/bt.h include/astrometry/build-index.h include/astrometry/cairoutils.h include/astrometry/catalog.h include/astrometry/coadd.h include/astrometry/codefile.h include/astrometry/codekd.h include/astrometry/codetree.h include/astrometry/constellation-boundaries.h include/astrometry/constellations.h include/astrometry/convolve-image.h include/astrometry/ctmf.h include/astrometry/dimage.h include/astrometry/dualtree.h include/astrometry/dualtree_nearestneighbour.h include/astrometry/dualtree_rangesearch.h include/astrometry/engine.h include/astrometry/errors.h include/astrometry/fileutils.h include/astrometry/fit-wcs.h include/astrometry/fits-guess-scale.h include/astrometry/fitsbin.h include/astrometry/fitsfile.h include/astrometry/fitsioutils.h include/astrometry/fitstable.h include/astrometry/gslutils.h include/astrometry/hd.h include/astrometry/healpix-utils.h include/astrometry/healpix.h include/astrometry/hpquads.h include/astrometry/image2xy-files.h include/astrometry/image2xy.h include/astrometry/index.h include/astrometry/intmap.h include/astrometry/ioutils.h include/astrometry/kdtree.h include/astrometry/kdtree_fits_io.h include/astrometry/keywords.h include/astrometry/log.h include/astrometry/matchfile.h include/astrometry/matchobj.h include/astrometry/mathutil.h include/astrometry/merge-index.h include/astrometry/multiindex.h include/astrometry/new-wcs.h include/astrometry/nomad-fits.h include/astrometry/nomad.h include/astrometry/onefield.h include/astrometry/openngc.h include/astrometry/os-features-config.h include/astrometry/os-features.h include/astrometry/permutedsort.h include/astrometry/plotannotations.h include/astrometry/plotfill.h include/astrometry/plotgrid.h include/astrometry/plotimage.h include/astrometry/plotoutline.h include/astrometry/plotstuff.h include/astrometry/plotxy.h include/astrometry/qfits_byteswap.h include/astrometry/qfits_card.h include/astrometry/qfits_convert.h include/astrometry/qfits_error.h include/astrometry/qfits_float.h include/astrometry/qfits_header.h include/astrometry/qfits_image.h include/astrometry/qfits_keywords.h include/astrometry/qfits_md5.h include/astrometry/qfits_memory.h include/astrometry/qfits_rw.h include/astrometry/qfits_std.h include/astrometry/qfits_table.h include/astrometry/qfits_time.h include/astrometry/qfits_tools.h include/astrometry/qidxfile.h include/astrometry/quad-builder.h include/astrometry/quad-utils.h include/astrometry/quadfile.h include/astrometry/rdlist.h include/astrometry/resample.h include/astrometry/resort-xylist.h include/astrometry/scamp-catalog.h include/astrometry/scamp.h include/astrometry/simplexy-common.h include/astrometry/simplexy.h include/astrometry/sip-utils.h include/astrometry/sip.h include/astrometry/sip_qfits.h include/astrometry/solvedfile.h include/astrometry/solver.h include/astrometry/solverutils.h include/astrometry/starkd.h include/astrometry/starutil.h include/astrometry/starutil.inc include/astrometry/starxy.h include/astrometry/tabsort.h include/astrometry/tic.h include/astrometry/tweak.h include/astrometry/tweak2.h include/astrometry/tycho2-fits.h include/astrometry/tycho2.h include/astrometry/ucac3.h include/astrometry/ucac4.h include/astrometry/ucac5.h include/astrometry/uniformize-catalog.h include/astrometry/unpermute-quads.h include/astrometry/unpermute-stars.h include/astrometry/usnob-fits.h include/astrometry/usnob.h include/astrometry/verify.h include/astrometry/wcs-pv2sip.h include/astrometry/wcs-rd2xy.h include/astrometry/wcs-xy2rd.h include/astrometry/xylist.h lib/libanbase.a lib/libanfiles.a lib/libanutils.a lib/libastrometry.a lib/libastrometry.so lib/libcatalogs.a lib/libkd.a lib/libqfits.a %%PYTHON_LIBDIR%%/astrometry/__init__.py %%PYTHON_LIBDIR%%/astrometry/catalogs/__init__.py %%PYTHON_LIBDIR%%/astrometry/libkd/__init__.py %%PYTHON_LIBDIR%%/astrometry/libkd/spherematch.py %%PYTHON_LIBDIR%%/astrometry/libkd/spherematch_c%%PYTHON_EXT_SUFFIX%%.so %%PYTHON_LIBDIR%%/astrometry/net/client/client.py +%%PYTHON_LIBDIR%%/astrometry/plot/__init__.py %%PYTHON_LIBDIR%%/astrometry/plot/_plotstuff_c%%PYTHON_EXT_SUFFIX%%.so +%%PYTHON_LIBDIR%%/astrometry/plot/plotann.py %%PYTHON_LIBDIR%%/astrometry/plot/plotstuff.py %%PYTHON_LIBDIR%%/astrometry/plot/plotstuff_c.py %%PYTHON_LIBDIR%%/astrometry/sdss/__init__.py %%PYTHON_LIBDIR%%/astrometry/sdss/_cutils%%PYTHON_EXT_SUFFIX%%.so %%PYTHON_LIBDIR%%/astrometry/sdss/casjobs.py %%PYTHON_LIBDIR%%/astrometry/sdss/common.py %%PYTHON_LIBDIR%%/astrometry/sdss/cutils.py %%PYTHON_LIBDIR%%/astrometry/sdss/cutout.py %%PYTHON_LIBDIR%%/astrometry/sdss/dr10.py %%PYTHON_LIBDIR%%/astrometry/sdss/dr7.py %%PYTHON_LIBDIR%%/astrometry/sdss/dr8.py %%PYTHON_LIBDIR%%/astrometry/sdss/dr9.py %%PYTHON_LIBDIR%%/astrometry/sdss/fields.py %%PYTHON_LIBDIR%%/astrometry/sdss/runList-dr10.par %%PYTHON_LIBDIR%%/astrometry/sdss/runList-dr8.par %%PYTHON_LIBDIR%%/astrometry/sdss/runList-dr9.par %%PYTHON_LIBDIR%%/astrometry/sdss/sdss_das.py %%PYTHON_LIBDIR%%/astrometry/sdss/sdss_name.py %%PYTHON_LIBDIR%%/astrometry/sdss/yanny.py %%PYTHON_LIBDIR%%/astrometry/solver/__init__.py %%PYTHON_LIBDIR%%/astrometry/util/EXIF.py %%PYTHON_LIBDIR%%/astrometry/util/__init__.py +%%PYTHON_LIBDIR%%/astrometry/util/_util%%PYTHON_EXT_SUFFIX%%.so %%PYTHON_LIBDIR%%/astrometry/util/addpath.py %%PYTHON_LIBDIR%%/astrometry/util/file.py %%PYTHON_LIBDIR%%/astrometry/util/filetype.py %%PYTHON_LIBDIR%%/astrometry/util/find_data_file.py %%PYTHON_LIBDIR%%/astrometry/util/fits.py %%PYTHON_LIBDIR%%/astrometry/util/fix_sdss_idr.py %%PYTHON_LIBDIR%%/astrometry/util/horizons.py %%PYTHON_LIBDIR%%/astrometry/util/image2pnm.py %%PYTHON_LIBDIR%%/astrometry/util/imageutils.py %%PYTHON_LIBDIR%%/astrometry/util/miscutils.py %%PYTHON_LIBDIR%%/astrometry/util/multiproc.py %%PYTHON_LIBDIR%%/astrometry/util/plotshift.py %%PYTHON_LIBDIR%%/astrometry/util/plotutils.py %%PYTHON_LIBDIR%%/astrometry/util/removelines.py %%PYTHON_LIBDIR%%/astrometry/util/resample.py %%PYTHON_LIBDIR%%/astrometry/util/run_command.py %%PYTHON_LIBDIR%%/astrometry/util/shell.py %%PYTHON_LIBDIR%%/astrometry/util/siap.py %%PYTHON_LIBDIR%%/astrometry/util/stages.py %%PYTHON_LIBDIR%%/astrometry/util/starutil.py %%PYTHON_LIBDIR%%/astrometry/util/starutil_numpy.py %%PYTHON_LIBDIR%%/astrometry/util/timingpool.py %%PYTHON_LIBDIR%%/astrometry/util/ttime.py %%PYTHON_LIBDIR%%/astrometry/util/uniformize.py %%PYTHON_LIBDIR%%/astrometry/util/usnob_catalog.py %%PYTHON_LIBDIR%%/astrometry/util/usnob_get_image.py %%PYTHON_LIBDIR%%/astrometry/util/usnob_get_region.py %%PYTHON_LIBDIR%%/astrometry/util/util.py man/man1/an-fitstopnm.1.gz man/man1/an-pnmtofits.1.gz man/man1/astrometry-engine.1.gz man/man1/build-astrometry-index.1.gz man/man1/coadd.1.gz man/man1/downsample-fits.1.gz man/man1/fit-wcs.1.gz man/man1/fits-flip-endian.1.gz man/man1/fits-guess-scale.1.gz man/man1/fitsgetext.1.gz man/man1/get-healpix.1.gz man/man1/get-wcs.1.gz man/man1/hpsplit.1.gz man/man1/image2xy.1.gz man/man1/new-wcs.1.gz man/man1/pad-file.1.gz man/man1/plot-constellations.1.gz man/man1/plotquad.1.gz man/man1/plotxy.1.gz man/man1/query-starkd.1.gz man/man1/solve-field.1.gz man/man1/subtable.1.gz man/man1/tabsort.1.gz man/man1/wcs-grab.1.gz man/man1/wcs-match.1.gz man/man1/wcs-pv2sip.1.gz man/man1/wcs-rd2xy.1.gz man/man1/wcs-resample.1.gz man/man1/wcs-to-tan.1.gz man/man1/wcs-xy2rd.1.gz man/man1/wcsinfo.1.gz %%DATADIR%%/catalogs/abell-all.fits %%DATADIR%%/catalogs/brightstars.fits %%DATADIR%%/catalogs/openngc-ic.fits %%DATADIR%%/catalogs/openngc-names.fits %%DATADIR%%/catalogs/openngc-ngc.fits %%DATADIR%%/catalogs/ugc.fits %%DATADIR%%/catalogs/uzc2000.fits %%DATADIR%%/sdss/cut-tsObj-002830-6-0-0398.fit %%DATADIR%%/sdss/psf.fits %%DATADIR%%/sdss/psf00.fits %%DATADIR%%/sdss/psf01k.fits %%DATADIR%%/sdss/psf02k.fits %%DATADIR%%/sdss/psf1k0.fits %%DATADIR%%/sdss/psf2k0.fits %%DATADIR%%/sdss/tsField-002830-6-0398.fit %%DATADIR%%/solver/index-9918.fits %%PORTDOCS%%%%DOCSDIR%%/CREDITS %%PORTDOCS%%%%DOCSDIR%%/LICENSE %%PORTDOCS%%%%DOCSDIR%%/README.md %%PORTDOCS%%%%DOCSDIR%%/report.txt %%PORTEXAMPLES%%%%EXAMPLESDIR%%/CREDITS %%PORTEXAMPLES%%%%EXAMPLESDIR%%/apod1.jpg %%PORTEXAMPLES%%%%EXAMPLESDIR%%/apod1.xyls %%PORTEXAMPLES%%%%EXAMPLESDIR%%/apod2.jpg %%PORTEXAMPLES%%%%EXAMPLESDIR%%/apod2.xyls %%PORTEXAMPLES%%%%EXAMPLESDIR%%/apod3.jpg %%PORTEXAMPLES%%%%EXAMPLESDIR%%/apod3.xyls %%PORTEXAMPLES%%%%EXAMPLESDIR%%/apod4.jpg %%PORTEXAMPLES%%%%EXAMPLESDIR%%/apod4.xyls %%PORTEXAMPLES%%%%EXAMPLESDIR%%/apod5.jpg %%PORTEXAMPLES%%%%EXAMPLESDIR%%/apod5.xyls %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cfg %%PORTEXAMPLES%%%%EXAMPLESDIR%%/index-4119.fits %%PORTEXAMPLES%%%%EXAMPLESDIR%%/m44-1910-04-01.jpg %%PORTEXAMPLES%%%%EXAMPLESDIR%%/m44-1975-01-18.jpg %%PORTEXAMPLES%%%%EXAMPLESDIR%%/sdss.jpg %%PORTEXAMPLES%%%%EXAMPLESDIR%%/sdss.xyls %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tycho2-mag6.fits