From owner-svn-ports-all@freebsd.org Thu Oct 22 16:54:08 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 00C7944D522; Thu, 22 Oct 2020 16:54:08 +0000 (UTC) (envelope-from lwhsu@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CHD3M6Dshz47df; Thu, 22 Oct 2020 16:54:07 +0000 (UTC) (envelope-from lwhsu@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B94CA19F21; Thu, 22 Oct 2020 16:54:07 +0000 (UTC) (envelope-from lwhsu@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 09MGs7wh018695; Thu, 22 Oct 2020 16:54:07 GMT (envelope-from lwhsu@FreeBSD.org) Received: (from lwhsu@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 09MGs7al018692; Thu, 22 Oct 2020 16:54:07 GMT (envelope-from lwhsu@FreeBSD.org) Message-Id: <202010221654.09MGs7al018692@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: lwhsu set sender to lwhsu@FreeBSD.org using -f From: Li-Wen Hsu Date: Thu, 22 Oct 2020 16:54:07 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r552996 - head/astro/geographiclib X-SVN-Group: ports-head X-SVN-Commit-Author: lwhsu X-SVN-Commit-Paths: head/astro/geographiclib X-SVN-Commit-Revision: 552996 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Oct 2020 16:54:08 -0000 Author: lwhsu Date: Thu Oct 22 16:54:06 2020 New Revision: 552996 URL: https://svnweb.freebsd.org/changeset/ports/552996 Log: astro/geographiclib: Add IGRF-13 dataset PR: 250445 Submitted by: Tatsuki Makino (maintainer) Modified: head/astro/geographiclib/Makefile head/astro/geographiclib/distinfo head/astro/geographiclib/pkg-plist Modified: head/astro/geographiclib/Makefile ============================================================================== --- head/astro/geographiclib/Makefile Thu Oct 22 16:25:18 2020 (r552995) +++ head/astro/geographiclib/Makefile Thu Oct 22 16:54:06 2020 (r552996) @@ -3,6 +3,7 @@ PORTNAME= geographiclib DISTVERSION= 1.50.1 +PORTREVISION= 1 CATEGORIES= astro MASTER_SITES= SF/geographiclib/distrib\ SF/geographiclib/distrib/archive\ @@ -26,9 +27,7 @@ CMAKE_ARGS= -DGEOGRAPHICLIB_DATA:STRING=${DATADIR:Q}\ -DINSTALL_DOC_DIR:STRING=${DOCSDIR:Q} OPTIONS_DEFINE= DOCS DOXYGEN PERL -OPTIONS_DEFAULT= DOXYGEN PERL\ - GEOID_EGM96_5 GRAVITY_EGM96 GRAVITY_WGS84\ - MAGNETIC_WMM2020 MAGNETIC_IGRF12 +OPTIONS_DEFAULT= DOXYGEN PERL PERL_DESC= Build documentation with pod2man and pod2html OPTIONS_GROUP= DATASETS OPTIONS_SUB= yes @@ -45,8 +44,11 @@ GEOID_NAMES= egm84-30 egm84-15 egm96-15 egm96-5\ egm2008-5 egm2008-2_5 egm2008-1 GRAVITY_NAMES= egm84 egm96 egm2008 wgs84 grs80 MAGNETIC_NAMES= wmm2010 wmm2015 wmm2015v2 wmm2020\ - igrf11 igrf12\ + igrf11 igrf12 igrf13\ emm2010 emm2015 emm2017 +DEFAULT_GEOID_NAMES= egm96-5 +DEFAULT_GRAVITY_NAMES= egm96 wgs84 +DEFAULT_MAGNETIC_NAMES= wmm2020 igrf12 DEPRECATED_NAMES= wmm2015 .for n in ${GEOID_NAMES} @@ -54,25 +56,37 @@ GEOID_${n:C/[^0-9A-Z_a-z]/_/g:tu}_DESC= Install ${n} ${"${DEPRECATED_NAMES:M${n}}"!="":?(deprecated):} OPTIONS_GROUP_DATASETS+= GEOID_${n:C/[^0-9A-Z_a-z]/_/g:tu} GEOID_${n:C/[^0-9A-Z_a-z]/_/g:tu}_DISTFILES= geoids-distrib/${n}.tar.bz2:geoids -MAKESUM_OPTIONS_DEFAULT+= GEOID_${n:C/[^0-9A-Z_a-z]/_/g:tu} +ALL_DATASETS_OPTIONS+= GEOID_${n:C/[^0-9A-Z_a-z]/_/g:tu} +. if !empty(DEFAULT_GEOID_NAMES:M${n}) +DEF_DATASETS_OPTIONS+= GEOID_${n:C/[^0-9A-Z_a-z]/_/g:tu} +. endif .endfor .for n in ${GRAVITY_NAMES} GRAVITY_${n:C/[^0-9A-Z_a-z]/_/g:tu}_DESC= Install ${n} gravity model\ ${"${DEPRECATED_NAMES:M${n}}"!="":?(deprecated):} OPTIONS_GROUP_DATASETS+= GRAVITY_${n:C/[^0-9A-Z_a-z]/_/g:tu} GRAVITY_${n:C/[^0-9A-Z_a-z]/_/g:tu}_DISTFILES= gravity-distrib/${n}.tar.bz2:gravity -MAKESUM_OPTIONS_DEFAULT+= GRAVITY_${n:C/[^0-9A-Z_a-z]/_/g:tu} +ALL_DATASETS_OPTIONS+= GRAVITY_${n:C/[^0-9A-Z_a-z]/_/g:tu} +. if !empty(DEFAULT_GRAVITY_NAMES:M${n}) +DEF_DATASETS_OPTIONS+= GRAVITY_${n:C/[^0-9A-Z_a-z]/_/g:tu} +. endif .endfor .for n in ${MAGNETIC_NAMES} MAGNETIC_${n:C/[^0-9A-Z_a-z]/_/g:tu}_DESC= Install ${n} magnetic model\ ${"${DEPRECATED_NAMES:M${n}}"!="":?(deprecated):} OPTIONS_GROUP_DATASETS+= MAGNETIC_${n:C/[^0-9A-Z_a-z]/_/g:tu} MAGNETIC_${n:C/[^0-9A-Z_a-z]/_/g:tu}_DISTFILES= magnetic-distrib/${n}.tar.bz2:magnetic -MAKESUM_OPTIONS_DEFAULT+= MAGNETIC_${n:C/[^0-9A-Z_a-z]/_/g:tu} +ALL_DATASETS_OPTIONS+= MAGNETIC_${n:C/[^0-9A-Z_a-z]/_/g:tu} +. if !empty(DEFAULT_MAGNETIC_NAMES:M${n}) +DEF_DATASETS_OPTIONS+= MAGNETIC_${n:C/[^0-9A-Z_a-z]/_/g:tu} +. endif .endfor -.ifmake makesum || distclean -OPTIONS_DEFAULT= ${MAKESUM_OPTIONS_DEFAULT} +.ifmake makesum || makeplist || distclean +OPTIONS_DEFAULT+= ${ALL_DATASETS_OPTIONS} +_OPTIONS_OK= yes # to prevent recursive execution +.else +OPTIONS_DEFAULT+= ${DEF_DATASETS_OPTIONS} .endif post-patch: @@ -100,8 +114,7 @@ install-datasets-${n}: .NOTMAIN .PHONY: install-datasets-${n} .endfor -.PHONY: x-tool-plist -x-tool-plist: ${PLIST} .NOTMAIN +x-tool-plist: .NOTMAIN .PHONY ${PLIST} ${REINPLACE_CMD}\ -e '/^%%PORTDOCS%%/d'\ -e '/^%%DATADIR%%\/geoids\/[^.]/{\ Modified: head/astro/geographiclib/distinfo ============================================================================== --- head/astro/geographiclib/distinfo Thu Oct 22 16:25:18 2020 (r552995) +++ head/astro/geographiclib/distinfo Thu Oct 22 16:54:06 2020 (r552996) @@ -1,4 +1,4 @@ -TIMESTAMP = 1581822000 +TIMESTAMP = 1603076400 SHA256 (GeographicLib/GeographicLib-1.50.1.tar.gz) = d1765009e068b8cc5e76957e5d6be45ce6cff08c4aad8e5995e84a28354385f1 SIZE (GeographicLib/GeographicLib-1.50.1.tar.gz) = 2463854 SHA256 (GeographicLib/geoids-distrib/egm2008-1.tar.bz2) = bdb382d0be7ece9142450eacc24b7b7f0889ee3e0ba4f535b04ec383f94c0fb5 @@ -35,6 +35,8 @@ SHA256 (GeographicLib/magnetic-distrib/igrf11.tar.bz2) SIZE (GeographicLib/magnetic-distrib/igrf11.tar.bz2) = 6011 SHA256 (GeographicLib/magnetic-distrib/igrf12.tar.bz2) = fbad03ea24d9aa87e2fbc0179ea7f8a4787f235a2ec360abe42cd312000cba3f SIZE (GeographicLib/magnetic-distrib/igrf12.tar.bz2) = 6640 +SHA256 (GeographicLib/magnetic-distrib/igrf13.tar.bz2) = 74a9467fcdb2f210903221fe9d780ac0eed39dd3c87e4995e537a382cbe4daee +SIZE (GeographicLib/magnetic-distrib/igrf13.tar.bz2) = 7210 SHA256 (GeographicLib/magnetic-distrib/wmm2010.tar.bz2) = a40aced2d5d36b3183f3efc759820d16a7daab81a33a0b81db0510e8d17dbb5e SIZE (GeographicLib/magnetic-distrib/wmm2010.tar.bz2) = 1442 SHA256 (GeographicLib/magnetic-distrib/wmm2015.tar.bz2) = 4c3fddb09955bbb556a955d81580af89172d8b630b54b45e1b2fabc194ec474f Modified: head/astro/geographiclib/pkg-plist ============================================================================== --- head/astro/geographiclib/pkg-plist Thu Oct 22 16:25:18 2020 (r552995) +++ head/astro/geographiclib/pkg-plist Thu Oct 22 16:54:06 2020 (r552996) @@ -142,6 +142,8 @@ sbin/geographiclib-get-magnetic %%MAGNETIC_IGRF11%%%%DATADIR%%/magnetic/igrf11.wmm.cof %%MAGNETIC_IGRF12%%%%DATADIR%%/magnetic/igrf12.wmm %%MAGNETIC_IGRF12%%%%DATADIR%%/magnetic/igrf12.wmm.cof +%%MAGNETIC_IGRF13%%%%DATADIR%%/magnetic/igrf13.wmm +%%MAGNETIC_IGRF13%%%%DATADIR%%/magnetic/igrf13.wmm.cof %%MAGNETIC_WMM2010%%%%DATADIR%%/magnetic/wmm2010.wmm %%MAGNETIC_WMM2010%%%%DATADIR%%/magnetic/wmm2010.wmm.cof %%MAGNETIC_WMM2015%%%%DATADIR%%/magnetic/wmm2015.wmm