3 files changed, 95 insertions, 77 deletions

diff --git a/astro/geographiclib/Makefile b/astro/geographiclib/Makefile
index c5ce8845bb79..e0888b50cdef 100644
--- a/astro/geographiclib/Makefile
+++ b/astro/geographiclib/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	geographiclib
-PORTVERSION=	1.41
+PORTVERSION=	1.42
 CATEGORIES=	astro
 MASTER_SITES=	SF/geographiclib/distrib\
 		SF/geographiclib:geoids,gravity,magnetic
@@ -15,9 +15,10 @@ COMMENT=	Library for geographic projections
 
 LICENSE=	MIT
 
-USES=		gmake libtool python
+BUILD_DEPENDS=	${LOCALBASE}/share/aclocal/ax_check_compile_flag.m4:${PORTSDIR}/devel/autoconf-archive
+
+USES=		autoreconf gmake libtool python
 USE_GCC=	any
-USE_AUTOTOOLS=	autoconf
 WRKSRC=		${WRKDIR}/${DISTNAME}
 NO_WRKSUBDIR=	yes
 PORTDOCS=	*
diff --git a/astro/geographiclib/distinfo b/astro/geographiclib/distinfo
index 3dc9860a13fe..d450fb2788ed 100644
--- a/astro/geographiclib/distinfo
+++ b/astro/geographiclib/distinfo
@@ -1,5 +1,5 @@
-SHA256 (GeographicLib/GeographicLib-1.41.tar.gz) = 9d5eb90d5d33b0cbbecf71937acbfbd556615e346822340abdcb427aaf0390db
-SIZE (GeographicLib/GeographicLib-1.41.tar.gz) = 2037253
+SHA256 (GeographicLib/GeographicLib-1.42.tar.gz) = 10b997a526e75a1a4dc0eb62159d294afaab2e7a900eaa721511becbc868ae09
+SIZE (GeographicLib/GeographicLib-1.42.tar.gz) = 2050213
 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 e7e6badd3f8e..efaff32c5708 100644
--- a/astro/geographiclib/pkg-plist
+++ b/astro/geographiclib/pkg-plist
@@ -52,7 +52,7 @@ include/GeographicLib/Utility.hpp
 lib/libGeographic.a
 lib/libGeographic.so
 lib/libGeographic.so.14
-lib/libGeographic.so.14.0.2
+lib/libGeographic.so.14.0.3
 %%PYTHON_SITELIBDIR%%/geographiclib/__init__.py
 %%PYTHON_SITELIBDIR%%/geographiclib/accumulator.py
 %%PYTHON_SITELIBDIR%%/geographiclib/constants.py
@@ -61,77 +61,6 @@ lib/libGeographic.so.14.0.2
 %%PYTHON_SITELIBDIR%%/geographiclib/geodesicline.py
 %%PYTHON_SITELIBDIR%%/geographiclib/geomath.py
 %%PYTHON_SITELIBDIR%%/geographiclib/polygonarea.py
-libexec/GeographicLib/matlab/cassini_fwd.m
-libexec/GeographicLib/matlab/cassini_inv.m
-libexec/GeographicLib/matlab/defaultellipsoid.m
-libexec/GeographicLib/matlab/ecc2flat.m
-libexec/GeographicLib/matlab/eqdazim_fwd.m
-libexec/GeographicLib/matlab/eqdazim_inv.m
-libexec/GeographicLib/matlab/flat2ecc.m
-libexec/GeographicLib/matlab/gedistance.m
-libexec/GeographicLib/matlab/gedoc.m
-libexec/GeographicLib/matlab/geocentricforward.cpp
-libexec/GeographicLib/matlab/geocentricforward.m
-libexec/GeographicLib/matlab/geocentricreverse.cpp
-libexec/GeographicLib/matlab/geocentricreverse.m
-libexec/GeographicLib/matlab/geodarea.m
-libexec/GeographicLib/matlab/geoddistance.m
-libexec/GeographicLib/matlab/geoddoc.m
-libexec/GeographicLib/matlab/geodesicdirect.cpp
-libexec/GeographicLib/matlab/geodesicdirect.m
-libexec/GeographicLib/matlab/geodesicinverse.cpp
-libexec/GeographicLib/matlab/geodesicinverse.m
-libexec/GeographicLib/matlab/geodesicline.cpp
-libexec/GeographicLib/matlab/geodesicline.m
-libexec/GeographicLib/matlab/geodproj.m
-libexec/GeographicLib/matlab/geodreckon.m
-libexec/GeographicLib/matlab/geographiclibinterface.m
-libexec/GeographicLib/matlab/geoidheight.cpp
-libexec/GeographicLib/matlab/geoidheight.m
-libexec/GeographicLib/matlab/gereckon.m
-libexec/GeographicLib/matlab/gnomonic_fwd.m
-libexec/GeographicLib/matlab/gnomonic_inv.m
-libexec/GeographicLib/matlab/localcartesianforward.cpp
-libexec/GeographicLib/matlab/localcartesianforward.m
-libexec/GeographicLib/matlab/localcartesianreverse.cpp
-libexec/GeographicLib/matlab/localcartesianreverse.m
-libexec/GeographicLib/matlab/mgrsforward.cpp
-libexec/GeographicLib/matlab/mgrsforward.m
-libexec/GeographicLib/matlab/mgrsreverse.cpp
-libexec/GeographicLib/matlab/mgrsreverse.m
-libexec/GeographicLib/matlab/polygonarea.cpp
-libexec/GeographicLib/matlab/polygonarea.m
-libexec/GeographicLib/matlab/private/A1m1f.m
-libexec/GeographicLib/matlab/private/A2m1f.m
-libexec/GeographicLib/matlab/private/A3coeff.m
-libexec/GeographicLib/matlab/private/A3f.m
-libexec/GeographicLib/matlab/private/AngDiff.m
-libexec/GeographicLib/matlab/private/AngNormalize.m
-libexec/GeographicLib/matlab/private/AngNormalize2.m
-libexec/GeographicLib/matlab/private/AngRound.m
-libexec/GeographicLib/matlab/private/C1f.m
-libexec/GeographicLib/matlab/private/C1pf.m
-libexec/GeographicLib/matlab/private/C2f.m
-libexec/GeographicLib/matlab/private/C3coeff.m
-libexec/GeographicLib/matlab/private/C3f.m
-libexec/GeographicLib/matlab/private/C4coeff.m
-libexec/GeographicLib/matlab/private/C4f.m
-libexec/GeographicLib/matlab/private/G4coeff.m
-libexec/GeographicLib/matlab/private/SinCosNorm.m
-libexec/GeographicLib/matlab/private/SinCosSeries.m
-libexec/GeographicLib/matlab/private/atanhee.m
-libexec/GeographicLib/matlab/private/cbrt.m
-libexec/GeographicLib/matlab/private/cvmgt.m
-libexec/GeographicLib/matlab/private/sumx.m
-libexec/GeographicLib/matlab/private/swap.m
-libexec/GeographicLib/matlab/tranmerc_fwd.m
-libexec/GeographicLib/matlab/tranmerc_inv.m
-libexec/GeographicLib/matlab/utm_fwd.m
-libexec/GeographicLib/matlab/utm_inv.m
-libexec/GeographicLib/matlab/utmupsforward.cpp
-libexec/GeographicLib/matlab/utmupsforward.m
-libexec/GeographicLib/matlab/utmupsreverse.cpp
-libexec/GeographicLib/matlab/utmupsreverse.m
 man/man1/CartConvert.1.gz
 man/man1/ConicProj.1.gz
 man/man1/GeoConvert.1.gz
@@ -191,3 +120,91 @@ share/cmake/GeographicLib/FindGeographicLib.cmake
 %%MAGNETIC_WMM2010%%%%DATADIR%%/magnetic/wmm2010.wmm.cof
 %%MAGNETIC_WMM2015%%%%DATADIR%%/magnetic/wmm2015.wmm
 %%MAGNETIC_WMM2015%%%%DATADIR%%/magnetic/wmm2015.wmm.cof
+share/matlab/geographiclib-legacy/Contents.m
+share/matlab/geographiclib-legacy/geocentricforward.cpp
+share/matlab/geographiclib-legacy/geocentricforward.m
+share/matlab/geographiclib-legacy/geocentricreverse.cpp
+share/matlab/geographiclib-legacy/geocentricreverse.m
+share/matlab/geographiclib-legacy/geodesicdirect.cpp
+share/matlab/geographiclib-legacy/geodesicdirect.m
+share/matlab/geographiclib-legacy/geodesicinverse.cpp
+share/matlab/geographiclib-legacy/geodesicinverse.m
+share/matlab/geographiclib-legacy/geodesicline.cpp
+share/matlab/geographiclib-legacy/geodesicline.m
+share/matlab/geographiclib-legacy/geographiclibinterface.m
+share/matlab/geographiclib-legacy/geoidheight.cpp
+share/matlab/geographiclib-legacy/geoidheight.m
+share/matlab/geographiclib-legacy/localcartesianforward.cpp
+share/matlab/geographiclib-legacy/localcartesianforward.m
+share/matlab/geographiclib-legacy/localcartesianreverse.cpp
+share/matlab/geographiclib-legacy/localcartesianreverse.m
+share/matlab/geographiclib-legacy/mgrsforward.cpp
+share/matlab/geographiclib-legacy/mgrsforward.m
+share/matlab/geographiclib-legacy/mgrsreverse.cpp
+share/matlab/geographiclib-legacy/mgrsreverse.m
+share/matlab/geographiclib-legacy/polygonarea.cpp
+share/matlab/geographiclib-legacy/polygonarea.m
+share/matlab/geographiclib-legacy/utmupsforward.cpp
+share/matlab/geographiclib-legacy/utmupsforward.m
+share/matlab/geographiclib-legacy/utmupsreverse.cpp
+share/matlab/geographiclib-legacy/utmupsreverse.m
+share/matlab/geographiclib/Contents.m
+share/matlab/geographiclib/cassini_fwd.m
+share/matlab/geographiclib/cassini_inv.m
+share/matlab/geographiclib/defaultellipsoid.m
+share/matlab/geographiclib/ecc2flat.m
+share/matlab/geographiclib/eqdazim_fwd.m
+share/matlab/geographiclib/eqdazim_inv.m
+share/matlab/geographiclib/flat2ecc.m
+share/matlab/geographiclib/gedistance.m
+share/matlab/geographiclib/gedoc.m
+share/matlab/geographiclib/geocent_fwd.m
+share/matlab/geographiclib/geocent_inv.m
+share/matlab/geographiclib/geodarea.m
+share/matlab/geographiclib/geoddistance.m
+share/matlab/geographiclib/geoddoc.m
+share/matlab/geographiclib/geodreckon.m
+share/matlab/geographiclib/geoid_height.m
+share/matlab/geographiclib/geoid_load.m
+share/matlab/geographiclib/gereckon.m
+share/matlab/geographiclib/gnomonic_fwd.m
+share/matlab/geographiclib/gnomonic_inv.m
+share/matlab/geographiclib/loccart_fwd.m
+share/matlab/geographiclib/loccart_inv.m
+share/matlab/geographiclib/mgrs_fwd.m
+share/matlab/geographiclib/mgrs_inv.m
+share/matlab/geographiclib/polarst_fwd.m
+share/matlab/geographiclib/polarst_inv.m
+share/matlab/geographiclib/private/A1m1f.m
+share/matlab/geographiclib/private/A2m1f.m
+share/matlab/geographiclib/private/A3coeff.m
+share/matlab/geographiclib/private/A3f.m
+share/matlab/geographiclib/private/AngDiff.m
+share/matlab/geographiclib/private/AngNormalize.m
+share/matlab/geographiclib/private/AngNormalize2.m
+share/matlab/geographiclib/private/AngRound.m
+share/matlab/geographiclib/private/C1f.m
+share/matlab/geographiclib/private/C1pf.m
+share/matlab/geographiclib/private/C2f.m
+share/matlab/geographiclib/private/C3coeff.m
+share/matlab/geographiclib/private/C3f.m
+share/matlab/geographiclib/private/C4coeff.m
+share/matlab/geographiclib/private/C4f.m
+share/matlab/geographiclib/private/G4coeff.m
+share/matlab/geographiclib/private/GeoRotation.m
+share/matlab/geographiclib/private/SinCosSeries.m
+share/matlab/geographiclib/private/cbrtx.m
+share/matlab/geographiclib/private/cvmgt.m
+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/sumx.m
+share/matlab/geographiclib/private/swap.m
+share/matlab/geographiclib/private/tauf.m
+share/matlab/geographiclib/private/taupf.m
+share/matlab/geographiclib/projdoc.m
+share/matlab/geographiclib/tranmerc_fwd.m
+share/matlab/geographiclib/tranmerc_inv.m
+share/matlab/geographiclib/utmups_fwd.m
+share/matlab/geographiclib/utmups_inv.m