svn commit: r513033 - in head/astro/geographiclib: . files

Steve Wills swills at FreeBSD.org
Fri Sep 27 13:15:26 UTC 2019 

Author: swills
Date: Fri Sep 27 13:15:25 2019
New Revision: 513033
URL: https://svnweb.freebsd.org/changeset/ports/513033

Log:
  astro/geographiclib: update to 1.50
  
  PR:		240852
  Submitted by:	Tatsuki Makino <tatsuki_makino at hotmail.com> (maintainer)

Modified:
  head/astro/geographiclib/Makefile   (contents, props changed)
  head/astro/geographiclib/distinfo   (contents, props changed)
  head/astro/geographiclib/files/patch-CMakeLists.txt   (contents, props changed)
  head/astro/geographiclib/files/patch-cmake_CMakeLists.txt   (contents, props changed)
  head/astro/geographiclib/pkg-plist   (contents, props changed)

Modified: head/astro/geographiclib/Makefile
==============================================================================
--- head/astro/geographiclib/Makefile	Fri Sep 27 13:13:31 2019	(r513032)
+++ head/astro/geographiclib/Makefile	Fri Sep 27 13:15:25 2019	(r513033)
@@ -2,13 +2,13 @@
 # $FreeBSD$
 
 PORTNAME=	geographiclib
-PORTVERSION=	1.49
-PORTREVISION=	3
+DISTVERSION=	1.50
 CATEGORIES=	astro
 MASTER_SITES=	SF/geographiclib/distrib\
+		SF/geographiclib/distrib/archive\
 		SF/geographiclib:geoids,gravity,magnetic
-DISTNAME=	GeographicLib-${PORTVERSION}${DISTVERSIONSUFFIX}
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
+DISTNAME=	GeographicLib-${DISTVERSION}${DISTVERSIONSUFFIX}
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}	#
 DIST_SUBDIR=	GeographicLib
 
 MAINTAINER=	tatsuki_makino at hotmail.com
@@ -17,20 +17,19 @@ COMMENT=	Library for geographic projections
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-USES=		cmake compiler:c++14-lang python
-WRKSRC=		${WRKDIR}/GeographicLib-${PORTVERSION}
+USES=		cmake compiler:c++14-lang python:env
+WRKSRC=		${WRKDIR}/GeographicLib-${DISTVERSION}
 PORTDOCS=	*
-FETCH_ENV+=	HTTP_REFERER=
 USE_LDCONFIG=	yes
 CMAKE_ARGS=	-DGEOGRAPHICLIB_DATA:STRING=${DATADIR:Q}\
 		-DGEOGRAPHICLIB_LIB_TYPE:STRING=BOTH\
 		-DINSTALL_PYTHON_DIR:STRING=${PYTHON_SITELIBDIR:Q}\
 		-DINSTALL_DOC_DIR:STRING=${DOCSDIR:Q}
 
-OPTIONS_DEFINE=	DOXYGEN PERL DOCS
+OPTIONS_DEFINE=	DOCS DOXYGEN PERL
 OPTIONS_DEFAULT=	DOXYGEN PERL\
 			GEOID_EGM96_5 GRAVITY_EGM96 GRAVITY_WGS84\
-			MAGNETIC_WMM2015 MAGNETIC_IGRF12
+			MAGNETIC_WMM2015V2 MAGNETIC_IGRF12
 PERL_DESC=	Build documentation with pod2man and pod2html
 OPTIONS_GROUP=	DATASETS
 OPTIONS_SUB=	yes
@@ -40,27 +39,32 @@ DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen\
 PERL_CMAKE_BOOL_OFF=	GEOGRAPHICLIB_NO_PERL
 PERL_USE=	PERL5=build
 PERL_USES=	perl5
+PERL_BUILD_DEPENDS=	nroff:textproc/groff
 
 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 igrf11 igrf12\
+MAGNETIC_NAMES=		wmm2010 wmm2015 wmm2015v2 igrf11 igrf12\
 			emm2010 emm2015 emm2017
+DEPRECATED_NAMES=	wmm2015
 
 .for n in ${GEOID_NAMES}
-GEOID_${n:C/[^0-9A-Z_a-z]/_/g:tu}_DESC=		Install ${n} geoid dataset
+GEOID_${n:C/[^0-9A-Z_a-z]/_/g:tu}_DESC=		Install ${n} geoid dataset\
+	${"${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}
 .endfor
 .for n in ${GRAVITY_NAMES}
-GRAVITY_${n:C/[^0-9A-Z_a-z]/_/g:tu}_DESC=	Install ${n} gravity model
+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}
 .endfor
 .for n in ${MAGNETIC_NAMES}
-MAGNETIC_${n:C/[^0-9A-Z_a-z]/_/g:tu}_DESC=	Install ${n} magnetic model
+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}
@@ -75,7 +79,7 @@ post-patch:
 	${REINPLACE_CMD} -e 's/\(tail\) --lines/\1 -n/g'\
 		-e "s,head --lines -4,${SED} -e '\$$d' | ${SED} -e '\$$d' | ${SED} -e '\$$d' | ${SED} -e '\$$d',"\
 		${WRKSRC}/man/makeusage.sh
-	${REINPLACE_CMD} -e '/wget/s/wget -O/fetch -o /'\
+	${REINPLACE_CMD} -e '/wget/s,wget -O,${FETCH_BINARY} -o ,'\
 		${WRKSRC}/tools/geographiclib-get-*.sh
 
 .for n in ${GEOID_NAMES}

Modified: head/astro/geographiclib/distinfo
==============================================================================
--- head/astro/geographiclib/distinfo	Fri Sep 27 13:13:31 2019	(r513032)
+++ head/astro/geographiclib/distinfo	Fri Sep 27 13:15:25 2019	(r513033)
@@ -1,41 +1,43 @@
-TIMESTAMP = 1517542980
-SHA256 (GeographicLib/GeographicLib-1.49.tar.gz) = aec0ab52b6b9c9445d9d0a77e3af52257e21d6e74e94d8c2cb8fa6f11815ee2b
-SIZE (GeographicLib/GeographicLib-1.49.tar.gz) = 2448498
-SHA256 (GeographicLib/geoids-distrib/egm84-30.tar.bz2) = 18bc3e2b55c4f9f2f9ba8d14380dc47cc5c0d00dc2363b723d2305f30a91498e
-SIZE (GeographicLib/geoids-distrib/egm84-30.tar.bz2) = 416481
+TIMESTAMP = 1569492000
+SHA256 (GeographicLib/GeographicLib-1.50.tar.gz) = 2ac8888094d21ba48adb433c4bb569937497b39733e96c080b5ce278e2587622
+SIZE (GeographicLib/GeographicLib-1.50.tar.gz) = 2463958
+SHA256 (GeographicLib/geoids-distrib/egm2008-1.tar.bz2) = bdb382d0be7ece9142450eacc24b7b7f0889ee3e0ba4f535b04ec383f94c0fb5
+SIZE (GeographicLib/geoids-distrib/egm2008-1.tar.bz2) = 162388303
+SHA256 (GeographicLib/geoids-distrib/egm2008-2_5.tar.bz2) = d602e13446a4a4a23f39aecfe6a2a0760a1bc6c1b497482c2ebc9f7d513be699
+SIZE (GeographicLib/geoids-distrib/egm2008-2_5.tar.bz2) = 34927299
+SHA256 (GeographicLib/geoids-distrib/egm2008-5.tar.bz2) = 9a57c14330ac609132d324906822a9da9de265ad9b9087779793eb7080852970
+SIZE (GeographicLib/geoids-distrib/egm2008-5.tar.bz2) = 10414793
 SHA256 (GeographicLib/geoids-distrib/egm84-15.tar.bz2) = 579e3dad2f33b54f1fed16edb3ed9d4ae8cdad6ea064f7375af30d678eb2e51c
 SIZE (GeographicLib/geoids-distrib/egm84-15.tar.bz2) = 1475184
+SHA256 (GeographicLib/geoids-distrib/egm84-30.tar.bz2) = 18bc3e2b55c4f9f2f9ba8d14380dc47cc5c0d00dc2363b723d2305f30a91498e
+SIZE (GeographicLib/geoids-distrib/egm84-30.tar.bz2) = 416481
 SHA256 (GeographicLib/geoids-distrib/egm96-15.tar.bz2) = 8b1ebad1ebae0a045502d0edb9cc51553da1d3914f01e07470c11b3bed75048e
 SIZE (GeographicLib/geoids-distrib/egm96-15.tar.bz2) = 1490277
 SHA256 (GeographicLib/geoids-distrib/egm96-5.tar.bz2) = c46224f8f723dc915d97179f4e1580a98d6c742fe2b82cd8fef0ecaaad13e614
 SIZE (GeographicLib/geoids-distrib/egm96-5.tar.bz2) = 10225152
-SHA256 (GeographicLib/geoids-distrib/egm2008-5.tar.bz2) = 9a57c14330ac609132d324906822a9da9de265ad9b9087779793eb7080852970
-SIZE (GeographicLib/geoids-distrib/egm2008-5.tar.bz2) = 10414793
-SHA256 (GeographicLib/geoids-distrib/egm2008-2_5.tar.bz2) = d602e13446a4a4a23f39aecfe6a2a0760a1bc6c1b497482c2ebc9f7d513be699
-SIZE (GeographicLib/geoids-distrib/egm2008-2_5.tar.bz2) = 34927299
-SHA256 (GeographicLib/geoids-distrib/egm2008-1.tar.bz2) = bdb382d0be7ece9142450eacc24b7b7f0889ee3e0ba4f535b04ec383f94c0fb5
-SIZE (GeographicLib/geoids-distrib/egm2008-1.tar.bz2) = 162388303
+SHA256 (GeographicLib/gravity-distrib/egm2008.tar.bz2) = 54c1f511892a3d6a1362fb91a8f65efb4bd56e1cf4ff205344e003bd5074ed91
+SIZE (GeographicLib/gravity-distrib/egm2008.tar.bz2) = 74456990
 SHA256 (GeographicLib/gravity-distrib/egm84.tar.bz2) = 7ebec3b2aa2e88581470cd776299942c2300d797316b431c7a7da4ac2c31d80e
 SIZE (GeographicLib/gravity-distrib/egm84.tar.bz2) = 258023
 SHA256 (GeographicLib/gravity-distrib/egm96.tar.bz2) = 6fea4c6bd56ff8ac53dbdad8d5dd505c855471d0354c4abc5c5fe048bf8350c1
 SIZE (GeographicLib/gravity-distrib/egm96.tar.bz2) = 2055724
-SHA256 (GeographicLib/gravity-distrib/egm2008.tar.bz2) = 54c1f511892a3d6a1362fb91a8f65efb4bd56e1cf4ff205344e003bd5074ed91
-SIZE (GeographicLib/gravity-distrib/egm2008.tar.bz2) = 74456990
-SHA256 (GeographicLib/gravity-distrib/wgs84.tar.bz2) = 4cf4f7e533261986b25f9e3c929d846044e0fb2b9c35f301df545c335491f2e7
-SIZE (GeographicLib/gravity-distrib/wgs84.tar.bz2) = 807
 SHA256 (GeographicLib/gravity-distrib/grs80.tar.bz2) = 636c438460c9ccb90332bd6fd7d57dbfa62782ac6b64bd84989d559736579230
 SIZE (GeographicLib/gravity-distrib/grs80.tar.bz2) = 784
-SHA256 (GeographicLib/magnetic-distrib/wmm2010.tar.bz2) = a40aced2d5d36b3183f3efc759820d16a7daab81a33a0b81db0510e8d17dbb5e
-SIZE (GeographicLib/magnetic-distrib/wmm2010.tar.bz2) = 1442
-SHA256 (GeographicLib/magnetic-distrib/wmm2015.tar.bz2) = 4c3fddb09955bbb556a955d81580af89172d8b630b54b45e1b2fabc194ec474f
-SIZE (GeographicLib/magnetic-distrib/wmm2015.tar.bz2) = 1425
-SHA256 (GeographicLib/magnetic-distrib/igrf11.tar.bz2) = 1289557fe660052c8fb42eb62d3307e8efd95a4d05031a1befd92f1f433f6457
-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/gravity-distrib/wgs84.tar.bz2) = 4cf4f7e533261986b25f9e3c929d846044e0fb2b9c35f301df545c335491f2e7
+SIZE (GeographicLib/gravity-distrib/wgs84.tar.bz2) = 807
 SHA256 (GeographicLib/magnetic-distrib/emm2010.tar.bz2) = aa8782fddb505d8dc24e3dd26784712c1b1848227e23cdcb4e4f2d3ed49d9e14
 SIZE (GeographicLib/magnetic-distrib/emm2010.tar.bz2) = 3627692
 SHA256 (GeographicLib/magnetic-distrib/emm2015.tar.bz2) = 8e71a9704c5f2714bb65581df68e30f0d84d0ad17286d00efb782e7232334c3f
 SIZE (GeographicLib/magnetic-distrib/emm2015.tar.bz2) = 659405
 SHA256 (GeographicLib/magnetic-distrib/emm2017.tar.bz2) = 13ace8ecaf05bf07c7dda93f4a52e98e14be7147d23213fcbe946de3362954a1
 SIZE (GeographicLib/magnetic-distrib/emm2017.tar.bz2) = 1733711
+SHA256 (GeographicLib/magnetic-distrib/igrf11.tar.bz2) = 1289557fe660052c8fb42eb62d3307e8efd95a4d05031a1befd92f1f433f6457
+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/wmm2010.tar.bz2) = a40aced2d5d36b3183f3efc759820d16a7daab81a33a0b81db0510e8d17dbb5e
+SIZE (GeographicLib/magnetic-distrib/wmm2010.tar.bz2) = 1442
+SHA256 (GeographicLib/magnetic-distrib/wmm2015.tar.bz2) = 4c3fddb09955bbb556a955d81580af89172d8b630b54b45e1b2fabc194ec474f
+SIZE (GeographicLib/magnetic-distrib/wmm2015.tar.bz2) = 1425
+SHA256 (GeographicLib/magnetic-distrib/wmm2015v2.tar.bz2) = fda5e84ee803644c8695637f66ca2b278657633de6f83573eb988713d643a419
+SIZE (GeographicLib/magnetic-distrib/wmm2015v2.tar.bz2) = 1448

Modified: head/astro/geographiclib/files/patch-CMakeLists.txt
==============================================================================
--- head/astro/geographiclib/files/patch-CMakeLists.txt	Fri Sep 27 13:13:31 2019	(r513032)
+++ head/astro/geographiclib/files/patch-CMakeLists.txt	Fri Sep 27 13:15:25 2019	(r513033)
@@ -1,6 +1,6 @@
---- CMakeLists.txt.orig	2017-10-05 10:11:23 UTC
+--- CMakeLists.txt.orig	2019-09-24 12:55:55 UTC
 +++ CMakeLists.txt
-@@ -177,6 +177,11 @@ option (APPLE_MULTIPLE_ARCHITECTURES
+@@ -183,6 +183,11 @@ option (APPLE_MULTIPLE_ARCHITECTURES
  # directory is present you get this behavior regardless.
  option (CONVERT_WARNINGS_TO_ERRORS "Convert warnings into errors?" OFF)
  
@@ -12,7 +12,7 @@
  set (LIBNAME Geographic)
  if (MSVC OR CMAKE_CONFIGURATION_TYPES)
    # For multi-config systems and for Visual Studio, the debug version of
-@@ -450,7 +455,7 @@ endif ()
+@@ -475,7 +480,7 @@ endif ()
  # documentation files into the source tree.  Skip Apple here because
  # man/makeusage.sh uses "head --lines -4" to drop the last 4 lines of a
  # file and there's no simple equivalent for MacOSX

Modified: head/astro/geographiclib/files/patch-cmake_CMakeLists.txt
==============================================================================
--- head/astro/geographiclib/files/patch-cmake_CMakeLists.txt	Fri Sep 27 13:13:31 2019	(r513032)
+++ head/astro/geographiclib/files/patch-cmake_CMakeLists.txt	Fri Sep 27 13:15:25 2019	(r513033)
@@ -1,6 +1,6 @@
---- cmake/CMakeLists.txt.orig	2017-10-05 10:11:23 UTC
+--- cmake/CMakeLists.txt.orig	2019-09-24 12:55:55 UTC
 +++ cmake/CMakeLists.txt
-@@ -77,4 +77,4 @@ set (PACKAGE_VERSION "${PROJECT_VERSION}
+@@ -96,4 +96,4 @@ set (PACKAGE_VERSION "${PROJECT_VERSION}")
  configure_file (project.pc.in geographiclib.pc @ONLY)
  install (FILES
    "${CMAKE_CURRENT_BINARY_DIR}/geographiclib.pc"

Modified: head/astro/geographiclib/pkg-plist
==============================================================================
--- head/astro/geographiclib/pkg-plist	Fri Sep 27 13:13:31 2019	(r513032)
+++ head/astro/geographiclib/pkg-plist	Fri Sep 27 13:15:25 2019	(r513033)
@@ -60,8 +60,8 @@ lib/cmake/GeographicLib/geographiclib-targets-%%CMAKE_
 lib/cmake/GeographicLib/geographiclib-targets.cmake
 lib/libGeographic.a
 lib/libGeographic.so
-lib/libGeographic.so.17
-lib/libGeographic.so.17.1.2
+lib/libGeographic.so.19
+lib/libGeographic.so.19.0.0
 lib/node_modules/geographiclib/LICENSE.txt
 lib/node_modules/geographiclib/README.md
 lib/node_modules/geographiclib/geographiclib.js
@@ -146,6 +146,8 @@ sbin/geographiclib-get-magnetic
 %%MAGNETIC_WMM2010%%%%DATADIR%%/magnetic/wmm2010.wmm.cof
 %%MAGNETIC_WMM2015%%%%DATADIR%%/magnetic/wmm2015.wmm
 %%MAGNETIC_WMM2015%%%%DATADIR%%/magnetic/wmm2015.wmm.cof
+%%MAGNETIC_WMM2015V2%%%%DATADIR%%/magnetic/wmm2015v2.wmm
+%%MAGNETIC_WMM2015V2%%%%DATADIR%%/magnetic/wmm2015v2.wmm.cof
 share/matlab/geographiclib-legacy/Contents.m
 share/matlab/geographiclib-legacy/geocentricforward.m
 share/matlab/geographiclib-legacy/geocentricreverse.m
@@ -214,6 +216,7 @@ share/matlab/geographiclib/private/eatanhe.m
 share/matlab/geographiclib/private/geoid_file.m
 share/matlab/geographiclib/private/geoid_load_file.m
 share/matlab/geographiclib/private/norm2.m
+share/matlab/geographiclib/private/remx.m
 share/matlab/geographiclib/private/sincosdx.m
 share/matlab/geographiclib/private/sumx.m
 share/matlab/geographiclib/private/swap.m

More information about the svn-ports-all mailing list