Date: Sat, 12 Oct 2019 15:55:15 +0000 (UTC) From: Alexey Dokuchaev <danfe@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r514340 - in head/astro/astrometry: . files Message-ID: <201910121555.x9CFtFHq013754@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: danfe Date: Sat Oct 12 15:55:15 2019 New Revision: 514340 URL: https://svnweb.freebsd.org/changeset/ports/514340 Log: - Update `astro/astrometry' to version 0.78, unbreak, and undeprecate - Relax Python dependency: any version should be supported now - In MASTER_SITES and WWW line, remove bogus `www' prefix which breaks distfile downloads and website access - GC no longer useful (and actually no-op) `post-patch' target - Patch the makefiles to use BSD_INSTALL_* macros when needed instead of mass-stripping in the `post-install' target recipe Added: head/astro/astrometry/files/patch-blind_Makefile (contents, props changed) head/astro/astrometry/files/patch-libkd_Makefile (contents, props changed) head/astro/astrometry/files/patch-sdss_Makefile (contents, props changed) head/astro/astrometry/files/patch-util_Makefile (contents, props changed) Deleted: head/astro/astrometry/files/patch-Makefile head/astro/astrometry/files/patch-util_permutedsort.c Modified: head/astro/astrometry/Makefile head/astro/astrometry/distinfo head/astro/astrometry/pkg-descr head/astro/astrometry/pkg-plist Modified: head/astro/astrometry/Makefile ============================================================================== --- head/astro/astrometry/Makefile Sat Oct 12 15:48:59 2019 (r514339) +++ head/astro/astrometry/Makefile Sat Oct 12 15:55:15 2019 (r514340) @@ -2,10 +2,9 @@ # $FreeBSD$ PORTNAME= astrometry -PORTVERSION= 0.65 -PORTREVISION= 7 +PORTVERSION= 0.78 CATEGORIES= astro -MASTER_SITES= http://www.astrometry.net/downloads/ +MASTER_SITES= http://astrometry.net/downloads/ DISTNAME= ${PORTNAME}.net-${PORTVERSION} MAINTAINER= ports@FreeBSD.org @@ -13,9 +12,6 @@ COMMENT= Software for describing astronomical images LICENSE= GPLv2 -BROKEN= unfetchable -DEPRECATED= Unfetchable, unmaintained -EXPIRATION_DATE= 2019-10-16 BROKEN_aarch64= fails to link: os-features-test.c:10: undefined symbol 'canonicalize_file_name' 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' @@ -27,29 +23,18 @@ LIB_DEPENDS= libcairo.so:graphics/cairo \ libnetpbm.so:graphics/netpbm RUN_DEPENDS= ${PYNUMPY} -USES= gmake jpeg pkgconfig python:2.7 shebangfix tar:bzip2 -SHEBANG_FILES= blind/*.py sdss/*.py util/[!c]*.py util/casjobs.py +USES= gmake jpeg pkgconfig python shebangfix +SHEBANG_FILES= bin/* blind/*.py sdss/*.py util/[!c]*.py util/casjobs.py USE_LDCONFIG= ${PREFIX}/${PORTNAME}/lib ALL_TARGET= all extra -MAKE_ENV= INSTALL_DIR=${STAGEDIR}${PREFIX}/${PORTNAME} +MAKE_ENV= INSTALL_DIR=${STAGEDIR}${PREFIX}/${PORTNAME} \ + PYTHON=${PYTHON_CMD} PYTHON_SCRIPT=${PYTHON_CMD} MAKE_JOBS_UNSAFE= yes SUB_FILES= pkg-message LDFLAGS+= -lz -post-patch: - @${REINPLACE_CMD} -E 's,python (setup|-c),${PYTHON_CMD} \1,' \ - ${WRKSRC}/blind/Makefile ${WRKSRC}/libkd/Makefile \ - ${WRKSRC}/sdss/Makefile ${WRKSRC}/util/Makefile -# Outwit detection logic that thinks Clang does not support -shared argument - @${REINPLACE_CMD} -e '/CCTEST/s,\\|warning:,,' \ - ${WRKSRC}/util/makefile.common - post-install: @${REINPLACE_CMD} -i '' -e 's|${STAGEDIR}||' \ ${STAGEDIR}${PREFIX}/${PORTNAME}/etc/${PORTNAME}.cfg - @${FIND} ${STAGEDIR}${PREFIX}/${PORTNAME}/bin \ - -type f -not -name "*.py" -exec ${STRIP_CMD} {} \; - @${FIND} ${STAGEDIR}${PREFIX}/${PORTNAME}/lib \ - -type f -name "*.so" -exec ${STRIP_CMD} {} \; .include <bsd.port.mk> Modified: head/astro/astrometry/distinfo ============================================================================== --- head/astro/astrometry/distinfo Sat Oct 12 15:48:59 2019 (r514339) +++ head/astro/astrometry/distinfo Sat Oct 12 15:55:15 2019 (r514340) @@ -1,2 +1,3 @@ -SHA256 (astrometry.net-0.65.tar.bz2) = ef28a6e46d0c2c24fe4506753e526bd230368c0c92bb86725d2331febf35d9a2 -SIZE (astrometry.net-0.65.tar.bz2) = 10434497 +TIMESTAMP = 1555962008 +SHA256 (astrometry.net-0.78.tar.gz) = 9eda1b6cab5269b0a0e5d610aec86866cb8b08fb8f56254dc12f1690d69bc649 +SIZE (astrometry.net-0.78.tar.gz) = 11504535 Added: head/astro/astrometry/files/patch-blind_Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/astro/astrometry/files/patch-blind_Makefile Sat Oct 12 15:55:15 2019 (r514340) @@ -0,0 +1,61 @@ +--- blind/Makefile.orig 2019-04-22 16:25:30 UTC ++++ blind/Makefile +@@ -223,11 +223,11 @@ PYTHON_EXECS := plotann.py + PYTHON_INSTALL := $(PYTHON_EXECS) __init__.py + + install: $(INSTALL_EXECS) $(INSTALL_LIB) +- @echo Installing in directory '$(INSTALL_DIR)' ++ @echo Installing executables in directory '$(INSTALL_DIR)' + $(MKDIR) '$(INSTALL_DIR)/bin' + @for x in $(INSTALL_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) '$(ETC_INSTALL_DIR)' + $(PYTHON) -c "import os; print(open('../etc/astrometry.cfg-dist').read().replace('DATA_INSTALL_DIR', '$(DATA_FINAL_DIR)'))" > '$(ETC_INSTALL_DIR)/astrometry.cfg' +@@ -238,8 +238,8 @@ install: $(INSTALL_EXECS) $(INSTALL_LIB) + done + $(MKDIR) '$(LIB_INSTALL_DIR)' + @for x in $(INSTALL_LIB); do \ +- echo $(CP) $$x '$(LIB_INSTALL_DIR)'; \ +- $(CP) $$x '$(LIB_INSTALL_DIR)'; \ ++ echo $(BSD_INSTALL_LIB) $$x '$(LIB_INSTALL_DIR)'; \ ++ $(BSD_INSTALL_LIB) $$x '$(LIB_INSTALL_DIR)'; \ + done + $(MKDIR) '$(PY_INSTALL_DIR)' + @for x in $(PYTHON_INSTALL); do \ +@@ -254,26 +254,27 @@ install: $(INSTALL_EXECS) $(INSTALL_LIB) + done + + +-PYTHON_EXTRA_INSTALL := plotstuff.py plotstuff_c.py _plotstuff_c$(PYTHON_SO_EXT) ++PYTHON_EXTRA_INSTALL := plotstuff.py plotstuff_c.py + + 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)' + + test-solver: test-solver.o solver_test.o $(SLIB) + test-solver-2: test-solver-2.o solver_test_2.o $(SLIB) Added: head/astro/astrometry/files/patch-libkd_Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/astro/astrometry/files/patch-libkd_Makefile Sat Oct 12 15:55:15 2019 (r514340) @@ -0,0 +1,15 @@ +--- libkd/Makefile.orig 2019-04-22 16:25:30 UTC ++++ libkd/Makefile +@@ -136,10 +136,11 @@ install: $(LIBKD) + .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 Added: head/astro/astrometry/files/patch-sdss_Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/astro/astrometry/files/patch-sdss_Makefile Sat Oct 12 15:55:15 2019 (r514340) @@ -0,0 +1,22 @@ +--- sdss/Makefile.orig 2019-04-22 16:25:30 UTC ++++ sdss/Makefile +@@ -25,15 +25,15 @@ _cutils$(PYTHON_SO_EXT) cutils.py: cutils.i + + INSTALL_PY := __init__.py common.py cutout.py dr7.py dr8.py runList-dr8.par \ + dr9.py fields.py cutout.py runList-dr9.par dr10.py runList-dr10.par \ +- sdss_das.py sdss_name.py yanny.py ++ sdss_das.py sdss_name.py yanny.py cutils.py + +-INSTALL_LIB := cutils.py _cutils$(PYTHON_SO_EXT) ++INSTALL_LIB := _cutils$(PYTHON_SO_EXT) + + install-lib: + $(MKDIR) '$(MY_DIR)' + @for x in $(INSTALL_LIB); do \ +- echo $(CP) $$x '$(MY_DIR)'; \ +- $(CP) $$x '$(MY_DIR)'; \ ++ echo $(BSD_INSTALL_LIB) $$x '$(MY_DIR)'; \ ++ $(BSD_INSTALL_LIB) $$x '$(MY_DIR)'; \ + done + .PHONY: install-lib + Added: head/astro/astrometry/files/patch-util_Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/astro/astrometry/files/patch-util_Makefile Sat Oct 12 15:55:15 2019 (r514340) @@ -0,0 +1,24 @@ +--- util/Makefile.orig 2019-04-22 16:25:30 UTC ++++ util/Makefile +@@ -209,7 +209,9 @@ pyinstall: + echo $(CP) $$x '$(PY_INSTALL_DIR)/'$$x; \ + $(CP) $$x '$(PY_INSTALL_DIR)/'$$x; \ + done +- $(MAKE) py && $(CP) _util$(PYTHON_SO_EXT) util.py '$(PY_INSTALL_DIR)' ++ $(MAKE) py ++ $(CP) util.py '$(PY_INSTALL_DIR)' ++ $(BSD_INSTALL_LIB) _util$(PYTHON_SO_EXT) '$(PY_INSTALL_DIR)' + + .PHONY: pyinstall + +@@ -233,8 +235,8 @@ install-core: $(PYTHON_EXECS) $(PROGS) $(MAIN_PROGS) $ + done + @echo Installing executables into '$(BIN_INSTALL_DIR)'... + @for x in $(PROGS) $(MAIN_PROGS); do \ +- echo $(CP) $$x '$(BIN_INSTALL_DIR)/'$$x; \ +- $(CP) $$x '$(BIN_INSTALL_DIR)/'$$x; \ ++ echo $(BSD_INSTALL_PROGRAM) $$x '$(BIN_INSTALL_DIR)/'$$x; \ ++ $(BSD_INSTALL_PROGRAM) $$x '$(BIN_INSTALL_DIR)/'$$x; \ + done + @echo Installing headers into '$(INCLUDE_INSTALL_DIR)'... + $(MKDIR) '$(INCLUDE_INSTALL_DIR)' Modified: head/astro/astrometry/pkg-descr ============================================================================== --- head/astro/astrometry/pkg-descr Sat Oct 12 15:48:59 2019 (r514339) +++ head/astro/astrometry/pkg-descr Sat Oct 12 15:55:15 2019 (r514340) @@ -9,4 +9,4 @@ with absolutely no "false positives" (but maybe some " will do its best, even when the input image has no -- or totally incorrect -- meta-data. -WWW: http://www.astrometry.net/ +WWW: http://astrometry.net/ Modified: head/astro/astrometry/pkg-plist ============================================================================== --- head/astro/astrometry/pkg-plist Sat Oct 12 15:48:59 2019 (r514339) +++ head/astro/astrometry/pkg-plist Sat Oct 12 15:55:15 2019 (r514340) @@ -2,27 +2,27 @@ astrometry/bin/an-fitstopnm astrometry/bin/an-pnmtofits astrometry/bin/astrometry-engine astrometry/bin/build-astrometry-index -astrometry/bin/degtohms.py +astrometry/bin/degtohms astrometry/bin/downsample-fits astrometry/bin/fit-wcs astrometry/bin/fits-column-merge astrometry/bin/fits-flip-endian astrometry/bin/fits-guess-scale -astrometry/bin/fits2fits.py astrometry/bin/fitscopy astrometry/bin/fitsgetext +astrometry/bin/fitsverify astrometry/bin/get-healpix astrometry/bin/get-wcs -astrometry/bin/hmstodeg.py +astrometry/bin/hmstodeg astrometry/bin/hpsplit -astrometry/bin/image2pnm.py +astrometry/bin/image2pnm astrometry/bin/image2xy astrometry/bin/imarith astrometry/bin/imcopy astrometry/bin/imstat astrometry/bin/listhead astrometry/bin/liststruc -astrometry/bin/merge-columns.py +astrometry/bin/merge-columns astrometry/bin/modhead astrometry/bin/new-wcs astrometry/bin/pad-file @@ -31,15 +31,16 @@ astrometry/bin/plotann.py astrometry/bin/plotquad astrometry/bin/plotxy astrometry/bin/query-starkd -astrometry/bin/removelines.py +astrometry/bin/removelines astrometry/bin/solve-field +astrometry/bin/startree astrometry/bin/subtable astrometry/bin/tablist astrometry/bin/tabmerge astrometry/bin/tabsort -astrometry/bin/text2fits.py -astrometry/bin/uniformize.py -astrometry/bin/votabletofits.py +astrometry/bin/text2fits +astrometry/bin/uniformize +astrometry/bin/votabletofits astrometry/bin/wcs-grab astrometry/bin/wcs-match astrometry/bin/wcs-pv2sip @@ -52,7 +53,7 @@ astrometry/doc/CREDITS astrometry/doc/LICENSE astrometry/doc/README.md astrometry/doc/report.txt -astrometry/%%ETCDIR%%.cfg +astrometry/etc/astrometry.cfg astrometry/examples/CREDITS astrometry/examples/apod1.jpg astrometry/examples/apod1.xyls @@ -68,6 +69,7 @@ astrometry/examples/m44-1910-04-01.jpg astrometry/examples/m44-1975-01-18.jpg astrometry/examples/sdss.jpg astrometry/examples/sdss.xyls +astrometry/examples/tycho2-mag6.fits astrometry/include/astrometry/2mass-fits.h astrometry/include/astrometry/2mass.h astrometry/include/astrometry/allquads.h @@ -209,6 +211,7 @@ astrometry/lib/libanutils.a astrometry/lib/libastrometry.a astrometry/lib/libastrometry.so astrometry/lib/libcatalogs.a +astrometry/lib/libgsl-an.a astrometry/lib/libkd.a astrometry/lib/libqfits.a astrometry/lib/python/astrometry/__init__.py @@ -222,6 +225,7 @@ astrometry/lib/python/astrometry/catalogs/ngc2000.py astrometry/lib/python/astrometry/libkd/__init__.py astrometry/lib/python/astrometry/libkd/spherematch.py astrometry/lib/python/astrometry/libkd/spherematch_c.so +astrometry/lib/python/astrometry/net/client/client.py astrometry/lib/python/astrometry/sdss/__init__.py astrometry/lib/python/astrometry/sdss/_cutils.so astrometry/lib/python/astrometry/sdss/common.py @@ -243,18 +247,14 @@ astrometry/lib/python/astrometry/util/__init__.py astrometry/lib/python/astrometry/util/_util.so astrometry/lib/python/astrometry/util/addpath.py astrometry/lib/python/astrometry/util/casjobs.py -astrometry/lib/python/astrometry/util/degtohms.py astrometry/lib/python/astrometry/util/file.py astrometry/lib/python/astrometry/util/filetype.py astrometry/lib/python/astrometry/util/find_data_file.py astrometry/lib/python/astrometry/util/fits.py -astrometry/lib/python/astrometry/util/fits2fits.py astrometry/lib/python/astrometry/util/fix_sdss_idr.py -astrometry/lib/python/astrometry/util/hmstodeg.py astrometry/lib/python/astrometry/util/horizons.py astrometry/lib/python/astrometry/util/image2pnm.py astrometry/lib/python/astrometry/util/imageutils.py -astrometry/lib/python/astrometry/util/merge-columns.py astrometry/lib/python/astrometry/util/miscutils.py astrometry/lib/python/astrometry/util/multiproc.py astrometry/lib/python/astrometry/util/plotshift.py @@ -267,7 +267,6 @@ astrometry/lib/python/astrometry/util/siap.py astrometry/lib/python/astrometry/util/stages.py astrometry/lib/python/astrometry/util/starutil.py astrometry/lib/python/astrometry/util/starutil_numpy.py -astrometry/lib/python/astrometry/util/text2fits.py astrometry/lib/python/astrometry/util/timingpool.py astrometry/lib/python/astrometry/util/ttime.py astrometry/lib/python/astrometry/util/uniformize.py @@ -275,7 +274,6 @@ astrometry/lib/python/astrometry/util/usnob_catalog.py astrometry/lib/python/astrometry/util/usnob_get_image.py astrometry/lib/python/astrometry/util/usnob_get_region.py astrometry/lib/python/astrometry/util/util.py -astrometry/lib/python/astrometry/util/votabletofits.py astrometry/share/man/man1/an-fitstopnm.1 astrometry/share/man/man1/an-pnmtofits.1 astrometry/share/man/man1/astrometry-engine.1
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201910121555.x9CFtFHq013754>