From nobody Sun Sep 08 18:56:00 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4X1zh11Q3zz5VZYc; Sun, 08 Sep 2024 18:56:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4X1zh0504vz4M5q; Sun, 8 Sep 2024 18:56:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725821760; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=h9r6R1pV/RrUprm8xq1QUHDUNIM/93/DQTQp1XrKe5I=; b=xCNSNFSU/m8sF+1tSkr854jRyDx4HeEK4sDmEhIX5YdaFa9ota9w2h8roKdO2+EwOGJ9YE u6ZKQx/5p/n0mqqXDfzUhlvgJPU7rgRqcq5Smf4Jo/5HemYM+a5Lymr/XoEXtG0vLGsjim HIJn8lJS6ZsXPN7ZHtFsPt1dRA1f+IAef2nYQZu0oSUx75kGeiLQT8Cw1DBc6St0/wQ0/V q4h1MUEeV9SCk3SpRGozl0VHpg2Jlq9jnlPV4+34z2SFXTmGvWjhvgf1k28lCMLOekh6TN mBeDA13Yq/fGut83/TGSVdnrA/+5lBdDh2yi15OTmTXhVuUn6FRDaygYXHvJhQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725821760; a=rsa-sha256; cv=none; b=f7TZAGei14DHresKFTIEfP44EyoIDm+EIKakIgr8zk6oQqlZJOlkELAvoIvy3UXteB9EBV +cmAg5nQL/rLy6Ai8Ba4T88km9YCfcJPH4qLxukew8oalachioqaw++5WkOb9jQPOKlEru KrwiK+Ru2WPXLaycHvU1HD+siwsO8uZijhA3nx4yHIjRQndWly4ffPLMcGcsCw3/xpw2YH 6bmQ9HO+W2sHwMtSeVZaQOKCQdxNFDOEmi+iu5D+Jbl1SdpEuZr1W6owvxGgZwk7UCiwdF 2AYyBmI8RZOJ6QWhIZM+B9sgpwF1C5iy8iJCX2II3edxkV4pYid9KfZUa1Q8yw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725821760; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=h9r6R1pV/RrUprm8xq1QUHDUNIM/93/DQTQp1XrKe5I=; b=SKyhzE6sfkiN+k6wCasw/NzvCua97z+xwUni8QTw+fPzGDiF20/ZC8Z8nx10A5errIJfTO bbFak9hhgsRi0HwM3IREQulMKOxNObYC/Tjx7MtzU6ou3Jyyl7UJg0CSS0AjH/QpGWpVmw xsUsRtTojkkEtKZWlWCn50gT/Pa/n+5ZovRxeN9Txl5GyZ3p7aXkyFvZ1b5kZ/tfn5Wk1E +P7Nl562kVwZEtIP6oKo1p93huQ6VWeSKoCi3fS6b87ov96F87wRugWm1mRpZB3Afqt+lE Zxer0d/RKqBhOCpxnyFCDVILLer4ZZ4W9M61zYNLbQTFMKU0kQskpoMJPFr5YA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4X1zh04ZDhzWyY; Sun, 8 Sep 2024 18:56:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 488Iu0j9079061; Sun, 8 Sep 2024 18:56:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 488Iu0Sd079058; Sun, 8 Sep 2024 18:56:00 GMT (envelope-from git) Date: Sun, 8 Sep 2024 18:56:00 GMT Message-Id: <202409081856.488Iu0Sd079058@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 44ee1efab592 - main - astro/astrometry: Rename conflicting files List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 44ee1efab592b5add443268c553f6278789ad24f Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=44ee1efab592b5add443268c553f6278789ad24f commit 44ee1efab592b5add443268c553f6278789ad24f Author: Po-Chuan Hsieh AuthorDate: 2024-09-08 18:35:20 +0000 Commit: Po-Chuan Hsieh 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