Index: astro/geographiclib/Makefile
===================================================================
--- astro/geographiclib/Makefile	(revision 526339)
+++ astro/geographiclib/Makefile	(working copy)
@@ -26,9 +26,7 @@
 		-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 +43,11 @@
 			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,7 +55,10 @@
 	${"${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\
@@ -61,7 +65,10 @@
 	${"${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\
@@ -68,11 +75,17 @@
 	${"${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 +113,7 @@
 .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\/[^.]/{\
Index: astro/geographiclib/distinfo
===================================================================
--- astro/geographiclib/distinfo	(revision 526339)
+++ astro/geographiclib/distinfo	(working copy)
@@ -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 @@
 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
Index: astro/geographiclib/pkg-plist
===================================================================
--- astro/geographiclib/pkg-plist	(revision 526339)
+++ astro/geographiclib/pkg-plist	(working copy)
@@ -142,6 +142,8 @@
 %%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