git: 44ee1efab592 - main - astro/astrometry: Rename conflicting files

The branch main has been updated by sunpoet:

URL: https://cgit.FreeBSD.org/ports/commit/?id=44ee1efab592b5add443268c553f6278789ad24f

commit 44ee1efab592b5add443268c553f6278789ad24f
Author:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2024-09-08 18:35:20 +0000
Commit:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
CommitDate: 2024-09-08 18:40:25 +0000

    astro/astrometry: Rename conflicting files
    
    - Bump PORTREVISION for package change
    
    cfitsio 4.5.0+ installs fitscopy, fitsverify and imcopy to PREFIX/bin. Rename
    those files to avoid installation error.
    
    fitscopy from astrometry is a slightly modified copy from cfitsio.
    
    Approved by:    portmgr (blanket)
---
 astro/astrometry/Makefile  | 7 +++++++
 astro/astrometry/pkg-plist | 6 +++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/astro/astrometry/Makefile b/astro/astrometry/Makefile
index 600855636bb7..3aa69a2e2d8b 100644
--- a/astro/astrometry/Makefile
+++ b/astro/astrometry/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	astrometry
 PORTVERSION=	0.95
+PORTREVISION=	1
 CATEGORIES=	astro
 MASTER_SITES=	https://github.com/dstndstn/${PORTNAME}.net/releases/download/${DISTVERSION}/
 DISTNAME=	${PORTNAME}.net-${PORTVERSION}
@@ -50,6 +51,9 @@ 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 fits-flip-endian fits-guess-scale \
@@ -64,6 +68,9 @@ FILES=	an-fitstopnm an-pnmtofits astrometry-engine augment-xylist \
 post-install:
 .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
diff --git a/astro/astrometry/pkg-plist b/astro/astrometry/pkg-plist
index 3964df50e852..4ce66c599669 100644
--- a/astro/astrometry/pkg-plist
+++ b/astro/astrometry/pkg-plist
@@ -1,6 +1,9 @@
 bin/an-fitstopnm
 bin/an-pnmtofits
 bin/astrometry-engine
+bin/astrometry-fitscopy
+bin/astrometry-fitsverify
+bin/astrometry-imcopy
 bin/augment-xylist
 bin/build-astrometry-index
 bin/degtohms
@@ -9,9 +12,7 @@ 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
@@ -19,7 +20,6 @@ bin/hpsplit
 bin/image2pnm
 bin/image2xy
 bin/imarith
-bin/imcopy
 bin/imstat
 bin/listhead
 bin/liststruc