From nobody Sat Dec 7 16:45:15 2024 X-Original-To: dev-commits-ports-main@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 4Y5DWb4h6jz5fssd; Sat, 07 Dec 2024 16:45:15 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y5DWb3wNYz400Z; Sat, 7 Dec 2024 16:45:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733589915; 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=nuRRNhhIzeeQvNSWRAVf96vDGrsemnY+/p+slXxufxQ=; b=dqJXlbZDU1pm9JmfhaLXGSzU2eggoQZiKga/Rhmni30hDGgA5fl4yePJCjf5uAHnoIWSVU bAePEll6dyKc+czxrVOiVy+2JH+5eQ46g8+D1K0RnX5kHhqT7Cvnxa9b3njFB1hfXp8guN gxVbK6Q46j4r5HClCkusN2UG30VYwQvbvXyDzgdWLbEo7eF+rh9rTeHpMa/LtKkB78yqlp TCiklcABy8SAhwcyrSMPK5WYMJu9aVU/rBJImauFKV/RAcp6lkGaOXI2ls184eJ/HM7zCi C19iz/Nm0a80n0NpdowvEiggRp/LhywT4+/CWAZZ/wYaYEYo6/3uTXOfHmicXw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733589915; 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=nuRRNhhIzeeQvNSWRAVf96vDGrsemnY+/p+slXxufxQ=; b=aIgmWnnllp1Jp+pq9kJP1aM6RMXzrrVnstAcr1GWe92Rn9K+7Q56/7OHvM05mKAhBNct9V W4P5W9gA6ti72lazTO8vhkdGHFqZAP7bSmT9q15zRSQ/Z2p5t7WKcxbhKutLGsQozZr0TD j7XGAGMmtMps03URGg0RM4HFFLzjBm3aQpB0z8T+6+vGawyoEnhb/H4grB1kT6jzrQ9b2n vQFp0Q2s9Ml0IUboEx0UcncX4l8P43aOk088r/OnvUseRvCbG60y+xo5xwk88i5yiXep4N yYpGnraAdhH/Rl/OJrF0bcqvBubjF2ocKaLleXGXJfw8yY5a6Q0uusHvxcqvaA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733589915; a=rsa-sha256; cv=none; b=H0/UQVYKz+QRbc6JQblaAQzngkPg/KwEJaLbjE4POLGhpM6COZmPXKYNSfpkjA3NaAfw05 2sz2xym4JeeDaWcCn/gcRJHpa/MDfsT8BBDlg0Z9P4V3JaVZTvAKdq+kdJVlWoDwfqMeuf BX4CKNf/IVI7nSyfCCqLSwzVoONOp4d3NycsZKoNP72gHLEHUNNbpzrxsNM0izlTWvQloR C4fdhX7D2IVRvijGIgERXjCXeBwyBCze1DZKhMQQ0F5k2qCsrajyAtkEgHPHtdAa2axoYR LOjc2vp3Rwmp82COxa7fMjRmjoXL6D6z7b+rzLOqdd+G/KBrDI2TUd5bzkFJlQ== 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 4Y5DWb36lnzG9y; Sat, 7 Dec 2024 16:45:15 +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 4B7GjFIC018417; Sat, 7 Dec 2024 16:45:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B7GjFM8018414; Sat, 7 Dec 2024 16:45:15 GMT (envelope-from git) Date: Sat, 7 Dec 2024 16:45:15 GMT Message-Id: <202412071645.4B7GjFM8018414@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Rainer Hurling Subject: git: ab07b7c65d56 - main - astro/astrometry: Update to 0.97 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rhurlin X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ab07b7c65d5649ae1bd8f5b4696543308edfde94 Auto-Submitted: auto-generated The branch main has been updated by rhurlin: URL: https://cgit.FreeBSD.org/ports/commit/?id=ab07b7c65d5649ae1bd8f5b4696543308edfde94 commit ab07b7c65d5649ae1bd8f5b4696543308edfde94 Author: Rainer Hurling AuthorDate: 2024-12-07 16:44:14 +0000 Commit: Rainer Hurling CommitDate: 2024-12-07 16:44:14 +0000 astro/astrometry: Update to 0.97 - Some minor changes - While here, do some preparations for testing, not ready yet Changelog: https://github.com/dstndstn/astrometry.net/compare/0.96...0.97 Reported by: portscout, Repology --- astro/astrometry/Makefile | 29 ++++++++++++++-------- astro/astrometry/distinfo | 6 ++--- astro/astrometry/files/patch-configure | 7 ++++++ .../files/patch-gsl-an_grab-gsl-sources.sh | 8 ++++++ 4 files changed, 36 insertions(+), 14 deletions(-) diff --git a/astro/astrometry/Makefile b/astro/astrometry/Makefile index bdc05f0721e8..ba4c6de9e934 100644 --- a/astro/astrometry/Makefile +++ b/astro/astrometry/Makefile @@ -1,5 +1,5 @@ PORTNAME= astrometry -PORTVERSION= 0.96 +PORTVERSION= 0.97 CATEGORIES= astro MASTER_SITES= https://github.com/dstndstn/${PORTNAME}.net/releases/download/${DISTVERSION}/ DISTNAME= ${PORTNAME}.net-${PORTVERSION} @@ -13,7 +13,8 @@ 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= ${PY_SETUPTOOLS} \ +BUILD_DEPENDS= bash:shells/bash \ + ${PY_SETUPTOOLS} \ ${PYNUMPY} LIB_DEPENDS= libcairo.so:graphics/cairo \ libcfitsio.so:astro/cfitsio \ @@ -23,8 +24,11 @@ LIB_DEPENDS= libcairo.so:graphics/cairo \ 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 @@ -40,7 +44,10 @@ MAKE_ENV= INSTALL_DIR=${STAGEDIR}${PREFIX} \ PY_BASE_INSTALL_DIR=${STAGEDIR}${PYTHON_LIBDIR}/astrometry \ PYTHON=${PYTHON_CMD} PYTHON_SCRIPT=${PYTHON_CMD} MAKE_JOBS_UNSAFE= yes -ALL_TARGET= all extra +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 @@ -55,16 +62,16 @@ OPTIONS_DEFAULT= EXAMPLES 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 \ - 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 + 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 diff --git a/astro/astrometry/distinfo b/astro/astrometry/distinfo index 62767aa895bf..09aa4bf5eb80 100644 --- a/astro/astrometry/distinfo +++ b/astro/astrometry/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1727461875 -SHA256 (astrometry.net-0.96.tar.gz) = fb3f2ec09cbe155d9ff461b9a60336f8493f5cb7804199e1782664e9034c9aac -SIZE (astrometry.net-0.96.tar.gz) = 11772089 +TIMESTAMP = 1733564031 +SHA256 (astrometry.net-0.97.tar.gz) = e4eef1b658ba5ad462282b661c0ca3a5c538ba1716e853f7970b7b9fa4a33459 +SIZE (astrometry.net-0.97.tar.gz) = 11772460 diff --git a/astro/astrometry/files/patch-configure b/astro/astrometry/files/patch-configure new file mode 100644 index 000000000000..7d67f973a5af --- /dev/null +++ b/astro/astrometry/files/patch-configure @@ -0,0 +1,7 @@ +--- 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 new file mode 100644 index 000000000000..e783031a84bb --- /dev/null +++ b/astro/astrometry/files/patch-gsl-an_grab-gsl-sources.sh @@ -0,0 +1,8 @@ +--- 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 +