- Update to 1.45

PR:		203631
Submitted by:	tatsuki_makino@hotmail.com (maintainer)

3 files changed, 27 insertions, 19 deletions

diff --git a/astro/geographiclib/Makefile b/astro/geographiclib/Makefile
index 30e3c7a6761e..0f43d0601801 100644
--- a/astro/geographiclib/Makefile
+++ b/astro/geographiclib/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	geographiclib
-PORTVERSION=	1.44
+PORTVERSION=	1.45
 CATEGORIES=	astro
 MASTER_SITES=	SF/geographiclib/distrib\
 		SF/geographiclib:geoids,gravity,magnetic
@@ -14,6 +14,7 @@ MAINTAINER=	tatsuki_makino@hotmail.com
 COMMENT=	Library for geographic projections
 
 LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 BUILD_DEPENDS=	${LOCALBASE}/share/aclocal/ax_check_compile_flag.m4:${PORTSDIR}/devel/autoconf-archive
 
@@ -50,21 +51,18 @@ MAGNETIC_NAMES=		wmm2010 wmm2015 igrf11 igrf12 emm2010 emm2015
 GEOID_${n:C/[^0-9A-Z_a-z]/_/g:tu}_DESC=		Install ${n} geoid dataset
 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_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
 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_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
 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_DISTFILES+=		magnetic-distrib/${n}.tar.bz2:magnetic
 MAKESUM_OPTIONS_DEFAULT+=	MAGNETIC_${n:C/[^0-9A-Z_a-z]/_/g:tu}
 .endfor
 
@@ -73,12 +71,20 @@ MAKESUM_OPTIONS_DEFAULT+=	MAGNETIC_${n:C/[^0-9A-Z_a-z]/_/g:tu}
 OPTIONS_DEFAULT=	${MAKESUM_OPTIONS_DEFAULT}
 .endif
 
-.include <bsd.port.options.mk>
-
 post-patch:
 	${REINPLACE_CMD} -e '/wget/s/wget -O/fetch -o /'\
 		${WRKSRC}/tools/geographiclib-get-*.sh
 
+.for n in ${GEOID_NAMES}
+post-install-GEOID_${n:C/[^0-9A-Z_a-z]/_/g:tu}-on: install-datasets-geoids
+.endfor
+.for n in ${GRAVITY_NAMES}
+post-install-GRAVITY_${n:C/[^0-9A-Z_a-z]/_/g:tu}-on: install-datasets-gravity
+.endfor
+.for n in ${MAGNETIC_NAMES}
+post-install-MAGNETIC_${n:C/[^0-9A-Z_a-z]/_/g:tu}-on: install-datasets-magnetic
+.endfor
+
 .for n in geoids gravity magnetic
 install-datasets-${n}: .NOTMAIN
 	${MKDIR} ${STAGEDIR}${DATADIR}/${n}
@@ -87,16 +93,6 @@ install-datasets-${n}: .NOTMAIN
 .PHONY: install-datasets-${n}
 .endfor
 
-.if ${PORT_OPTIONS:MGEOID_*}
-post-install: install-datasets-geoids
-.endif
-.if ${PORT_OPTIONS:MGRAVITY_*}
-post-install: install-datasets-gravity
-.endif
-.if ${PORT_OPTIONS:MMAGNETIC_*}
-post-install: install-datasets-magnetic
-.endif
-
 .PHONY: x-tool-plist
 x-tool-plist: ${PLIST} .NOTMAIN
 	${REINPLACE_CMD}\
diff --git a/astro/geographiclib/distinfo b/astro/geographiclib/distinfo
index 560463b9e18f..fc0b15cbd5dd 100644
--- a/astro/geographiclib/distinfo
+++ b/astro/geographiclib/distinfo
@@ -1,5 +1,5 @@
-SHA256 (GeographicLib/GeographicLib-1.44.tar.gz) = f0423318fb30959632f403935827e06856737cf4621695ecc27fa9c251db9d37
-SIZE (GeographicLib/GeographicLib-1.44.tar.gz) = 2089179
+SHA256 (GeographicLib/GeographicLib-1.45.tar.gz) = fbcd9fc9b10de0830f5cb57665dc675ae61f81b370873bb4b95540d569410dae
+SIZE (GeographicLib/GeographicLib-1.45.tar.gz) = 2158951
 SHA256 (GeographicLib/geoids-distrib/egm84-30.tar.bz2) = 18bc3e2b55c4f9f2f9ba8d14380dc47cc5c0d00dc2363b723d2305f30a91498e
 SIZE (GeographicLib/geoids-distrib/egm84-30.tar.bz2) = 416481
 SHA256 (GeographicLib/geoids-distrib/egm84-15.tar.bz2) = 579e3dad2f33b54f1fed16edb3ed9d4ae8cdad6ea064f7375af30d678eb2e51c
diff --git a/astro/geographiclib/pkg-plist b/astro/geographiclib/pkg-plist
index 5ac3c015d4d6..6c27bc30a6e6 100644
--- a/astro/geographiclib/pkg-plist
+++ b/astro/geographiclib/pkg-plist
@@ -54,7 +54,18 @@ include/GeographicLib/Utility.hpp
 lib/libGeographic.a
 lib/libGeographic.so
 lib/libGeographic.so.14
-lib/libGeographic.so.14.2.0
+lib/libGeographic.so.14.2.1
+lib/node_modules/geographiclib/LICENSE.txt
+lib/node_modules/geographiclib/README.md
+lib/node_modules/geographiclib/geographiclib.js
+lib/node_modules/geographiclib/geographiclib.min.js
+lib/node_modules/geographiclib/package.json
+lib/node_modules/geographiclib/src/DMS.js
+lib/node_modules/geographiclib/src/Geodesic.js
+lib/node_modules/geographiclib/src/GeodesicLine.js
+lib/node_modules/geographiclib/src/Math.js
+lib/node_modules/geographiclib/src/PolygonArea.js
+lib/node_modules/geographiclib/test/geodesictest.js
 %%PYTHON_SITELIBDIR%%/geographiclib/__init__.py
 %%PYTHON_SITELIBDIR%%/geographiclib/accumulator.py
 %%PYTHON_SITELIBDIR%%/geographiclib/constants.py
@@ -168,6 +179,7 @@ share/matlab/geographiclib/geodarea.m
 share/matlab/geographiclib/geoddistance.m
 share/matlab/geographiclib/geoddoc.m
 share/matlab/geographiclib/geodreckon.m
+share/matlab/geographiclib/geographiclib_test.m
 share/matlab/geographiclib/geoid_height.m
 share/matlab/geographiclib/geoid_load.m
 share/matlab/geographiclib/gereckon.m