From nobody Sat Aug 13 19:29:54 2022 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 4M4rGV5kTCz4YkNk; Sat, 13 Aug 2022 19:29:54 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4M4rGV585lz3ryp; Sat, 13 Aug 2022 19:29:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660418994; 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=zCNCeTnsEguNOtzyZokr5sgphkjrB4KPJ0lmdxdGKWs=; b=YKiadQBfKsN/UBnKWtWvAG2TRk8vqBTZFxvDptpeSu7LF+eDleT/lo0L9SJlUFVgWsiQzj OeFvMABu/HzvnozCx48GmNa24WAs+I24QIZTunVKZRaNh4Gi+FP0PfPOCzklUttmdtSU7e 5SajaFpi1YfpSRQX2jSxYEUD8+tyQ24buMru6sRVVNhdb9p6tpgwb5P4quxHb4UEYwJzhR jx9aur6Q/PxeO32t2getwJErirAy/SzaAMQM7JDe1TP40KyZfnxIRj12uPNa0eRuMrMHRr N2zq9+rARtiY+tTcGmcuw1eoy9y501XHJaFZIRbn4SzbGXfxHvVrXG8+IBv6aw== 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 4M4rGV48C3zNMb; Sat, 13 Aug 2022 19:29:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 27DJTsVl016440; Sat, 13 Aug 2022 19:29:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27DJTs35016439; Sat, 13 Aug 2022 19:29:54 GMT (envelope-from git) Date: Sat, 13 Aug 2022 19:29:54 GMT Message-Id: <202208131929.27DJTs35016439@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: 7d3518db5799 - main - astro/astrometry: Update to 0.91 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: 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: 7d3518db5799e9524b8c8b4c5fefe1e99bad9087 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660418994; 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=zCNCeTnsEguNOtzyZokr5sgphkjrB4KPJ0lmdxdGKWs=; b=aX7hK90ZN3SPvoQtAESanuTBl9AoSmRcQ25YJ/2EsBRClmOsNiP2EkqBtmuf6LjWCAZMpH auzi5nxsNuQj0ir/V9zRwp/6Z+/UlRkRW1zfMDPpeljak5jViQbct7p2AiBIKHVW8ak6j5 VEdt+IYN7GYwOzczOmWjXt2j3HTZ80398qNy/sP7GjydI96MNpDk6mExum4TybuJFrKMIO ZAfDJDq2Du2lHSrxuKwl9m+LDQpYh0C3/wD0OXGuJLNrQCUWb1VF0AS5FjpkMNLPDWphdy ZN1aO4bzQ2Wncpz24Mco3fb5x7XcXsJ9U4Z5HUhcWyx6yIOXITV+hDK9xPkIjw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1660418994; a=rsa-sha256; cv=none; b=eEdZ+gpE3g62Ir4Q4OeDLMMSgt9cdQaEuqRS02EmTiogrp//IuJjZNihsd3Zh8BqJSzX3k HR4y19Gi7YZN3qwYFYpefgRuoIJcZBaJKQBijPaL7/FE4mLozNw5glwtkU4r2zvj7wa4TI Udcnqv4EB3ABQAGzizq0D4EFftqPWFBHlq0SRUXaOKvcuraOMlSc4/lVgCOn9nyDdPEkSJ s1h6qX26nrWrR6kVhWKlA1cHO8B7xZYBCWHs8pOGf4D44o3ybKBz3PtSrT+lYWNupDiaCY PXoVQO18jQu1HLXDERmJVSgR3uByoeWdKJSe31Jq7NirJv0k6e0qKTsgfSgOhg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rhurlin: URL: https://cgit.FreeBSD.org/ports/commit/?id=7d3518db5799e9524b8c8b4c5fefe1e99bad9087 commit 7d3518db5799e9524b8c8b4c5fefe1e99bad9087 Author: Rainer Hurling AuthorDate: 2022-08-13 19:25:37 +0000 Commit: Rainer Hurling CommitDate: 2022-08-13 19:25:37 +0000 astro/astrometry: Update to 0.91 Miscellaneous minor changes, most notably removing calls to deprecated functionality in numpy that was finally removed in their recent 1.23 release. Changelog: https://github.com/dstndstn/astrometry.net/releases/tag/0.91 Reported by: portscout, Repology --- astro/astrometry/Makefile | 5 ++--- astro/astrometry/distinfo | 6 +++--- astro/astrometry/files/patch-libkd_Makefile | 4 ++-- astro/astrometry/files/patch-plot_Makefile | 10 +++++----- astro/astrometry/pkg-plist | 5 +++++ 5 files changed, 17 insertions(+), 13 deletions(-) diff --git a/astro/astrometry/Makefile b/astro/astrometry/Makefile index 9239ac69832e..2cf63ca17005 100644 --- a/astro/astrometry/Makefile +++ b/astro/astrometry/Makefile @@ -1,6 +1,5 @@ PORTNAME= astrometry -PORTVERSION= 0.89 -PORTREVISION= 3 +PORTVERSION= 0.91 CATEGORIES= astro MASTER_SITES= http://astrometry.net/downloads/ DISTNAME= ${PORTNAME}.net-${PORTVERSION} @@ -26,7 +25,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}astropy>0:astro/py-astropy@${PY_FLAVOR} \ USES= gmake jpeg localbase pkgconfig python shebangfix USE_LDCONFIG= yes -SHEBANG_FILES= bin/* sdss/*.py solver/*.py util/[!c]*.py +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" \ diff --git a/astro/astrometry/distinfo b/astro/astrometry/distinfo index 95665bb0f7dd..511b19fd1da1 100644 --- a/astro/astrometry/distinfo +++ b/astro/astrometry/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1643299821 -SHA256 (astrometry.net-0.89.tar.gz) = 98e955a6f747cde06904e461df8e09cd58fe14b1ecceb193e3619d0f5fc64acb -SIZE (astrometry.net-0.89.tar.gz) = 11721482 +TIMESTAMP = 1660411922 +SHA256 (astrometry.net-0.91.tar.gz) = 832b7613a2a2974be0fb85b055b395707d10c172846e5cf83573a4e759a83b8e +SIZE (astrometry.net-0.91.tar.gz) = 11724838 diff --git a/astro/astrometry/files/patch-libkd_Makefile b/astro/astrometry/files/patch-libkd_Makefile index dad939fd793a..be75ede9af2a 100644 --- a/astro/astrometry/files/patch-libkd_Makefile +++ b/astro/astrometry/files/patch-libkd_Makefile @@ -1,6 +1,6 @@ ---- libkd/Makefile.orig 2019-04-22 16:25:30 UTC +--- libkd/Makefile.orig 2022-08-03 15:04:41 UTC +++ libkd/Makefile -@@ -136,10 +136,11 @@ install: $(LIBKD) +@@ -138,10 +138,11 @@ install-spherematch: spherematch_c$(PYTHON_SO_EXT) .PHONY: install-spherematch install-spherematch: spherematch_c$(PYTHON_SO_EXT) mkdir -p '$(PY_INSTALL_DIR)' diff --git a/astro/astrometry/files/patch-plot_Makefile b/astro/astrometry/files/patch-plot_Makefile index 879b71c4bc0a..3a308e802e82 100644 --- a/astro/astrometry/files/patch-plot_Makefile +++ b/astro/astrometry/files/patch-plot_Makefile @@ -1,6 +1,6 @@ ---- plot/Makefile.orig 2020-07-16 20:26:35 UTC +--- plot/Makefile.orig 2022-08-03 15:04:41 UTC +++ plot/Makefile -@@ -119,23 +119,24 @@ install: +@@ -105,23 +105,24 @@ install-extra: $(INSTALL_CAIRO_EXECS) PYTHON_EXTRA_INSTALL := plotstuff.py plotstuff_c.py _plotstuff_c$(PYTHON_SO_EXT) install-extra: $(INSTALL_CAIRO_EXECS) @@ -26,6 +26,6 @@ $(CP) $$x '$(PY_INSTALL_DIR)/'$$x; \ done + $(BSD_INSTALL_LIB) _plotstuff_c$(PYTHON_SO_EXT) '$(PY_INSTALL_DIR)' - - $(COMMON)/cairoutils.o: - $(MAKE) -C $(COMMON) cairoutils.o + @for x in $(PYTHON_INSTALL); do \ + echo $(CP) $$x '$(PY_INSTALL_DIR)/'$$x; \ + $(CP) $$x '$(PY_INSTALL_DIR)/'$$x; \ diff --git a/astro/astrometry/pkg-plist b/astro/astrometry/pkg-plist index f314f996e044..30533c19b021 100644 --- a/astro/astrometry/pkg-plist +++ b/astro/astrometry/pkg-plist @@ -1,6 +1,7 @@ bin/an-fitstopnm bin/an-pnmtofits bin/astrometry-engine +bin/augment-xylist bin/build-astrometry-index bin/degtohms bin/downsample-fits @@ -27,6 +28,7 @@ bin/modhead bin/new-wcs bin/pad-file bin/plot-constellations +bin/plotann.py bin/plotquad bin/plotxy bin/query-starkd @@ -197,7 +199,9 @@ lib/libqfits.a %%PYTHON_LIBDIR%%/astrometry/libkd/spherematch.py %%PYTHON_LIBDIR%%/astrometry/libkd/spherematch_c%%PYTHON_EXT_SUFFIX%%.so %%PYTHON_LIBDIR%%/astrometry/net/client/client.py +%%PYTHON_LIBDIR%%/astrometry/plot/__init__.py %%PYTHON_LIBDIR%%/astrometry/plot/_plotstuff_c%%PYTHON_EXT_SUFFIX%%.so +%%PYTHON_LIBDIR%%/astrometry/plot/plotann.py %%PYTHON_LIBDIR%%/astrometry/plot/plotstuff.py %%PYTHON_LIBDIR%%/astrometry/plot/plotstuff_c.py %%PYTHON_LIBDIR%%/astrometry/sdss/__init__.py @@ -220,6 +224,7 @@ lib/libqfits.a %%PYTHON_LIBDIR%%/astrometry/solver/__init__.py %%PYTHON_LIBDIR%%/astrometry/util/EXIF.py %%PYTHON_LIBDIR%%/astrometry/util/__init__.py +%%PYTHON_LIBDIR%%/astrometry/util/_util%%PYTHON_EXT_SUFFIX%%.so %%PYTHON_LIBDIR%%/astrometry/util/addpath.py %%PYTHON_LIBDIR%%/astrometry/util/file.py %%PYTHON_LIBDIR%%/astrometry/util/filetype.py