Index: head/graphics/p5-Geo-GDAL/Makefile
===================================================================
--- head/graphics/p5-Geo-GDAL/Makefile	(revision 489995)
+++ head/graphics/p5-Geo-GDAL/Makefile	(revision 489996)
@@ -1,34 +1,37 @@
 # Created by: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	Geo-GDAL
-PORTVERSION=	2.2.4
+PORTVERSION=	2.4.0
 CATEGORIES=	graphics perl5
 MASTER_SITES=	https://download.osgeo.org/gdal/${PORTVERSION}/ \
-		ftp://ftp.remotesensing.org/pub/gdal/${PORTVERSION}/ \
 		LOCAL/sunpoet
 PKGNAMEPREFIX=	p5-
 DISTNAME=	gdal-${PORTVERSION}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Perl binding for GDAL
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/../../LICENSE.TXT
 
 BUILD_DEPENDS=	p5-Capture-Tiny>=0:devel/p5-Capture-Tiny
 LIB_DEPENDS=	libgdal.so:graphics/gdal
 
-USES=		perl5 tar:xz
+USES=		compiler:c++11-lang perl5 tar:xz
 
+USE_CXXSTD=	c++11
 WRKSRC_SUBDIR=	swig/perl
 
 post-patch:
 	@${LN} -s ${LOCALBASE}/bin/gdal-config ${WRKSRC}/../../apps/gdal-config
 	@${REINPLACE_CMD} -e 's| INSTALL_BASE=.*||; s| install| pure_install|' ${WRKSRC}/Makefile
-	@${REINPLACE_CMD} -e 's|(const char \*)""|(char \*)""|' ${WRKSRC}/gdal_wrap.cpp ${WRKSRC}/ogr_wrap.cpp
+
+# GDALmake.opt is not available until configure phase
+post-configure:
+	@${SED} -e '/^GDAL_ROOT/d' ${LOCALBASE}/share/gdal/GDALmake.opt > ${WRKSRC}/../../GDALmake.opt
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Geo/GDAL/Const/Const.so ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Geo/*/*.so
 
 .include <bsd.port.mk>
Index: head/graphics/p5-Geo-GDAL/distinfo
===================================================================
--- head/graphics/p5-Geo-GDAL/distinfo	(revision 489995)
+++ head/graphics/p5-Geo-GDAL/distinfo	(revision 489996)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1521659854
-SHA256 (gdal-2.2.4.tar.xz) = 441eb1d1acb35238ca43a1a0a649493fc91fdcbab231d0747e9d462eea192278
-SIZE (gdal-2.2.4.tar.xz) = 8255840
+TIMESTAMP = 1546772828
+SHA256 (gdal-2.4.0.tar.xz) = c3791dcc6d37e59f6efa86e2df2a55a4485237b0a48e330ae08949f0cdf00f27
+SIZE (gdal-2.4.0.tar.xz) = 8874628