diff --git a/astro/astrometry/Makefile b/astro/astrometry/Makefile
index 73d6c0494f69..70ffdba310d5 100644
--- a/astro/astrometry/Makefile
+++ b/astro/astrometry/Makefile
@@ -1,81 +1,80 @@
 PORTNAME=	astrometry
-PORTVERSION=	0.92
-PORTREVISION=	1
+PORTVERSION=	0.93
 CATEGORIES=	astro
 MASTER_SITES=	http://astrometry.net/downloads/
 DISTNAME=	${PORTNAME}.net-${PORTVERSION}
 
 MAINTAINER=	rhurlin@FreeBSD.org
 COMMENT=	Astronomic calibration service
 WWW=		https://astrometry.net/
 
 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/* 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 <bsd.port.mk>
diff --git a/astro/astrometry/distinfo b/astro/astrometry/distinfo
index ead18ac5ae91..3ca04e0bcbd9 100644
--- a/astro/astrometry/distinfo
+++ b/astro/astrometry/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1669964707
-SHA256 (astrometry.net-0.92.tar.gz) = d6eec262bb8979028d64ea05322f80eec275d7aaeed5efd537e2a79410c678a5
-SIZE (astrometry.net-0.92.tar.gz) = 11761712
+TIMESTAMP = 1672048951
+SHA256 (astrometry.net-0.93.tar.gz) = 9a4854c87210422e113b8f6855912a38f0b187526171364ee2a889d36c674d70
+SIZE (astrometry.net-0.93.tar.gz) = 11761752
diff --git a/astro/astrometry/files/os-features-config.h b/astro/astrometry/files/os-features-config.h
deleted file mode 100644
index 644a53d2ec55..000000000000
--- a/astro/astrometry/files/os-features-config.h
+++ /dev/null
@@ -1,2 +0,0 @@
-#define NEED_CANONICALIZE_FILE_NAME 1
-#define HAVE_NETPBM 1
diff --git a/astro/astrometry/files/patch-include_astrometry_os-features.h b/astro/astrometry/files/patch-include_astrometry_os-features.h
new file mode 100644
index 000000000000..901d1c92b5cc
--- /dev/null
+++ b/astro/astrometry/files/patch-include_astrometry_os-features.h
@@ -0,0 +1,11 @@
+--- include/astrometry/os-features.h.orig	2022-12-19 21:41:15 UTC
++++ include/astrometry/os-features.h
+@@ -4,6 +4,8 @@
+ */
+ #ifndef OS_FEATURES_H
+ #define OS_FEATURES_H
++#define NEED_CANONICALIZE_FILE_NAME 1
++#define HAVE_NETPBM 1
+ 
+ #include "astrometry/os-features-config.h"
+ 
diff --git a/astro/astrometry/files/patch-util_Makefile b/astro/astrometry/files/patch-util_Makefile
index be9008addd0e..29b648699a10 100644
--- a/astro/astrometry/files/patch-util_Makefile
+++ b/astro/astrometry/files/patch-util_Makefile
@@ -1,35 +1,35 @@
---- util/Makefile.orig	2019-04-22 16:25:30 UTC
+--- util/Makefile.orig	2022-12-19 21:41:15 UTC
 +++ util/Makefile
-@@ -198,7 +198,9 @@ LINK_DIR := $(PY_BASE_LINK_DIR)/util
+@@ -203,7 +203,9 @@ install: install-core
  install: install-core
  	$(MAKE) install-core
  	@echo "The following copy commands may fail; they are optional."
 -	-$(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)'
  	@echo ok
  
  .PHONY: install
-@@ -209,7 +211,9 @@ pyinstall:
+@@ -214,7 +216,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 +237,8 @@ install-core: $(PYTHON_EXECS) $(PROGS) $(MAIN_PROGS) $
+@@ -238,8 +242,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)'