From nobody Mon Feb 28 15:07:03 2022 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 5F18B19E4FBD; Mon, 28 Feb 2022 15:07:03 +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 4K6kHq22wlz4nY8; Mon, 28 Feb 2022 15:07:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646060823; 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=1EnhEmHkxC2w+zPQSPH7mzjH4WFPGUKWdva6/4mNtYw=; b=koG3iFDyYK37nRFOgypLpWuAe9Rj2rKgQITyyqYcKl5AP6gQ/juddt8X4xLQMQMeGdhllk 4+Jf5Qh0+SY+rbKveFNAn7GlWUt7KB2wXw9r2VWURVWCYYa7dXXUq1sNVMI2uahsZiYmTm XO2DhjUYeNhdMPsV5PSkOVRFqvTnlSP9+i2slgLxgTyzNCqYwKPGWwZngkICTwe6Eap8e0 BkwmdM2P+GjGM2zXk1KWZe+oRYq78g0LHCyyP69r/YBBR9EixDhemd9jUAFfAxVo5PAm7W oh29cPdx064sP281Mq6uPjJ9aZL4KzeYPst6G9PBc2OkghPlRkWsQFj8SggnKA== 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 251FC1D764; Mon, 28 Feb 2022 15:07:03 +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 21SF73Qs045072; Mon, 28 Feb 2022 15:07:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21SF73cY045071; Mon, 28 Feb 2022 15:07:03 GMT (envelope-from git) Date: Mon, 28 Feb 2022 15:07:03 GMT Message-Id: <202202281507.21SF73cY045071@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: 402d2c7f2cef - main - science/healpix: Fix build with cfitsio 4.0.0+ 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: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: 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: 402d2c7f2cefb73ae9b36c701a35bfd97bfb8e5e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646060823; 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=1EnhEmHkxC2w+zPQSPH7mzjH4WFPGUKWdva6/4mNtYw=; b=PHCOS8sJe4Ab1tzvI+kqg75DD8zizN5Lk5smmaejPjvrJhPRzokiJfctfXKZDNZms49fLE Qb+s1k5TbyatOTqeWcLhvmcuuk9auBK9b9vn4Ozkc7KPt+R6VxheUw7B+W4xFsvI0x3LSu uFafFsm4MuZ6MOjRazUCxwXqfM2QOZNsKzi+3ZyV0pwXwT0RWI+3SMCBO/hBtUHVoyCLZM Zown34Twy1KL6V0INjpRWxBLYagaUZEj+vOdm+er5Ju/SN+BAKHc34b0+gqctKXt0uLIeA R7IUpwjj6RH3PHeK/5phFBUtmhleIqwuB+T0ketZjCl9RG2bZVAc9DbCah302Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646060823; a=rsa-sha256; cv=none; b=IfYFyF5UMR+f6WSAPfbawzbVTFYZFCkG/D3CGTsTF+55xhOiLVnGHW07MqYWXYukNDort8 iL33dJVkR3nMotJs13VJ0muWpkGMvPIGV0LYnbmAAnEeSJnVXMeiT3o0gc32aJ3WjoliCN 3mo81vZgDeLg/Ntw3huhWIXkSIfmu4/yyGR3+9zMytfuJzXbV1ymwPnA4pJOLPt6BIQ+b+ B2ajbSF+0E8yv581Oz2OCXgSUubhCnq25ChfzhSq/tiMsk9y0EQnqZtmEqL4QJ/HX4rQ/B pnRxo3oBMQxiseaKsVMM61QBxI1PHMjzy4LJjG5AR/pB+LO2nvZLDF6ZYknW3w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=402d2c7f2cefb73ae9b36c701a35bfd97bfb8e5e commit 402d2c7f2cefb73ae9b36c701a35bfd97bfb8e5e Author: Po-Chuan Hsieh AuthorDate: 2022-02-28 15:05:40 +0000 Commit: Po-Chuan Hsieh CommitDate: 2022-02-28 15:06:56 +0000 science/healpix: Fix build with cfitsio 4.0.0+ Obtained from: https://sourceforge.net/p/healpix/code/1189/tree//branches/branch_v380r1183/src/cxx/cxxsupport/fitshandle.cc?diff=50dae5f434309d7d74da16d0:1188 --- science/healpix/files/patch-cfitsio | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/science/healpix/files/patch-cfitsio b/science/healpix/files/patch-cfitsio new file mode 100644 index 000000000000..222cd29c4839 --- /dev/null +++ b/science/healpix/files/patch-cfitsio @@ -0,0 +1,32 @@ +Obtained from: https://sourceforge.net/p/healpix/code/1189/tree//branches/branch_v380r1183/src/cxx/cxxsupport/fitshandle.cc?diff=50dae5f434309d7d74da16d0:1188 + +--- src/cxx/cxxsupport/fitshandle.cc.orig 2016-11-24 15:27:09 UTC ++++ src/cxx/cxxsupport/fitshandle.cc +@@ -799,12 +799,27 @@ class cfitsio_checker + float fitsversion; + planck_assert(fits_get_version(&fitsversion), + "error calling fits_get_version()"); ++ /* CFITSIO 4.x switched to a three version format (4.0.0), as opposed ++ * to previous two-number versions (3.47). Version 4 defines a new macro ++ * CFITSIO_MICRO to track the patch level in the version. We check if ++ * macro is defined, and fall back to the old behaviour if it is not. ++ * If it is, we adapt to the new value returned by 'fits_get_version'. ++ */ ++#ifdef CFITSIO_MICRO ++ int v_header = nearest(1E6*CFITSIO_MAJOR + 1000.*CFITSIO_MINOR + CFITSIO_MICRO), ++ v_library = nearest(1E6*fitsversion); ++ if (v_header!=v_library) ++ cerr << endl << "WARNING: version mismatch between CFITSIO header (v" ++ << dataToString(v_header*1.0E-6) << ") and linked library (v" ++ << dataToString(v_library*1.0E-6) << ")." << endl << endl; ++#else + int v_header = nearest(1000.*CFITSIO_VERSION), + v_library = nearest(1000.*fitsversion); + if (v_header!=v_library) + cerr << endl << "WARNING: version mismatch between CFITSIO header (v" + << dataToString(v_header*0.001) << ") and linked library (v" + << dataToString(v_library*0.001) << ")." << endl << endl; ++#endif + } + }; +