diff --git a/astro/astrometry/Makefile b/astro/astrometry/Makefile
index ba4c6de9e934..5056e7347f54 100644
--- a/astro/astrometry/Makefile
+++ b/astro/astrometry/Makefile
@@ -1,94 +1,96 @@
 PORTNAME=	astrometry
 PORTVERSION=	0.97
+PORTREVISION=	1
 CATEGORIES=	astro
 MASTER_SITES=	https://github.com/dstndstn/${PORTNAME}.net/releases/download/${DISTVERSION}/
 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=	bash:shells/bash \
 		${PY_SETUPTOOLS} \
 		${PYNUMPY}
 LIB_DEPENDS=	libcairo.so:graphics/cairo \
 		libcfitsio.so:astro/cfitsio \
 		libgsl.so:math/gsl \
 		libnetpbm.so:graphics/netpbm \
 		libpng16.so:graphics/png \
 		libwcs.so:astro/wcslib
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}astropy>0:astro/py-astropy@${PY_FLAVOR} \
 		${PYNUMPY}
 #TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}matplotlib>=3.3.0:math/py-matplotlib@${PY_FLAVOR}
 
 USES=		gmake jpeg localbase pkgconfig python shebangfix
 # solver/test_tweak_plots.py: No module named 'tt'
 #USE_PYTHON=	pytest
 USE_LDCONFIG=	yes
 
-SHEBANG_FILES=	bin/* plot/plotann.py sdss/*.py solver/*.py util/[!c]*.py
+SHEBANG_FILES=	bin/* configure gsl-an/grab-gsl-sources.sh \
+		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}/share/man/man1 \
 		PY_BASE_INSTALL_DIR=${STAGEDIR}${PYTHON_LIBDIR}/astrometry \
 		PYTHON=${PYTHON_CMD} PYTHON_SCRIPT=${PYTHON_CMD}
 MAKE_JOBS_UNSAFE=	yes
 ALL_TARGET=	all py extra cfitsio-utils
 INSTALL_TARGET=	install install-cfitsio-utils
 #TEST_TARGET=	test
 
 LDFLAGS+=	-lz
 
 CONFLICTS_INSTALL=	afni p5-Text-RecordParser # bin/imstat bin/tabmerge
 
 SUB_FILES=	pkg-message
 
 OPTIONS_DEFINE=		DOCS EXAMPLES
 OPTIONS_DEFAULT=	EXAMPLES
 
 # These files are taken from cfitsio and installed by cfitsio 4.5.0+.
 # fitscopy was slightly modified by astrometry team.
 CFITSIO_FILES=	fitscopy fitsverify imcopy
 FILES=	an-fitstopnm an-pnmtofits astrometry-engine augment-xylist \
 	build-astrometry-index downsample-fits fit-wcs \
 	fits-column-merge fitscopy fitsverify fits-flip-endian \
 	fits-guess-scale fitsgetext 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:
 	${CP} -p ${WRKSRC}/solver/fitsverify ${STAGEDIR}${PREFIX}/bin/
 .for file in ${FILES}
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${file}
 .endfor
 .for file in ${CFITSIO_FILES}
 	${MV} ${STAGEDIR}${PREFIX}/bin/${file} ${STAGEDIR}${PREFIX}/bin/astrometry-${file}
 .endfor
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libastrometry.so
 	${STRIP_CMD} ${STAGEDIR}${PYTHON_LIBDIR}/astrometry/solver/_solver${PYTHON_EXT_SUFFIX}.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/files/patch-configure b/astro/astrometry/files/patch-configure
deleted file mode 100644
index 7d67f973a5af..000000000000
--- a/astro/astrometry/files/patch-configure
+++ /dev/null
@@ -1,7 +0,0 @@
---- configure.orig	2024-12-02 19:50:59 UTC
-+++ configure
-@@ -1,3 +1,3 @@
--#! /bin/bash
-+#!/usr/bin/env bash
- 
- echo "Ok"
diff --git a/astro/astrometry/files/patch-gsl-an_grab-gsl-sources.sh b/astro/astrometry/files/patch-gsl-an_grab-gsl-sources.sh
deleted file mode 100644
index e783031a84bb..000000000000
--- a/astro/astrometry/files/patch-gsl-an_grab-gsl-sources.sh
+++ /dev/null
@@ -1,8 +0,0 @@
---- gsl-an/grab-gsl-sources.sh.orig	2024-12-02 19:50:59 UTC
-+++ gsl-an/grab-gsl-sources.sh
-@@ -1,4 +1,4 @@
--#! /bin/bash
-+#!/usr/bin/env bash
- 
- GSL=/tmp/gsl-1.16
-