astro/astrometry: Update to 0.91

Miscellaneous minor changes, most notably removing calls to deprecated
functionality in numpy that was finally removed in their recent 1.23
release.

Changelog: https://github.com/dstndstn/astrometry.net/releases/tag/0.91

Reported by:	portscout, Repology

5 files changed, 17 insertions, 13 deletions

diff --git a/astro/astrometry/Makefile b/astro/astrometry/Makefile
index 9239ac69832e..2cf63ca17005 100644
--- a/astro/astrometry/Makefile
+++ b/astro/astrometry/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	astrometry
-PORTVERSION=	0.89
-PORTREVISION=	3
+PORTVERSION=	0.91
 CATEGORIES=	astro
 MASTER_SITES=	http://astrometry.net/downloads/
 DISTNAME=	${PORTNAME}.net-${PORTVERSION}
@@ -26,7 +25,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}astropy>0:astro/py-astropy@${PY_FLAVOR} \
 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" \
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,6 +1,6 @@
---- 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)'
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,6 +1,6 @@
---- 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)
@@ -26,6 +26,6 @@
  		$(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,6 +1,7 @@
 bin/an-fitstopnm
 bin/an-pnmtofits
 bin/astrometry-engine
+bin/augment-xylist
 bin/build-astrometry-index
 bin/degtohms
 bin/downsample-fits
@@ -27,6 +28,7 @@ bin/modhead
 bin/new-wcs
 bin/pad-file
 bin/plot-constellations
+bin/plotann.py
 bin/plotquad
 bin/plotxy
 bin/query-starkd
@@ -197,7 +199,9 @@ lib/libqfits.a
 %%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
@@ -220,6 +224,7 @@ lib/libqfits.a
 %%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