diff --git a/geo/gdal/Makefile b/geo/gdal/Makefile
index 0020415265a..68b662a5713 100644
--- a/geo/gdal/Makefile
+++ b/geo/gdal/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.76 2019/04/28 20:51:40 sthen Exp $
+# $OpenBSD: Makefile,v 1.77 2019/05/12 08:07:33 landry Exp $
 
 COMMENT-main =	translator library for geospatial data formats
 COMMENT-python =python bindings and utilities for GDAL
 COMMENT-perl =	perl bindings for GDAL
 
-V =		2.4.1
+V =		3.0.0
 DISTNAME =	gdal-${V}
 DISTFILES =	${DISTNAME}${EXTRACT_SUFX} \
 		gdalautotest-${V}${EXTRACT_SUFX}
@@ -15,10 +15,8 @@ FULLPKGNAME-python =	py-${DISTNAME}
 FULLPKGPATH-python =	geo/gdal,-python${FLAVOR_EXT:S/-/,/g}
 FULLPKGNAME-perl =	p5-Geo-GDAL-${V}
 FULLPKGPATH-perl =	geo/gdal,-perl
-REVISION-main =		0
-REVISION-perl =		0
 
-SHARED_LIBS =	gdal 34.0 #25.0
+SHARED_LIBS =	gdal 35.0 #26.0
 CATEGORIES =	geo devel
 
 HOMEPAGE =	http://www.gdal.org/
@@ -37,7 +35,6 @@ FLAVOR ?=
 .if ${FLAVOR:Mpython3}
 FULLPKGNAME-python =	py3-${DISTNAME}
 .endif
-REVISION-python =	0
 
 COMPILER = base-clang ports-gcc
 
@@ -60,8 +57,8 @@ LIB_DEPENDS-main =	databases/sqlite3 \
 			graphics/jasper \
 			graphics/openjp2 \
 			devel/pcre \
-			devel/proj \
-			devel/geotiff
+			devel/proj>=6.0 \
+			devel/geotiff>=1.5.0
 
 WANTLIB-main =		c crypto curl expat freexl geos geos_c geotiff gif \
 			iconv jasper jpeg json-c lzma m nghttp2 openjp2 \
@@ -79,7 +76,7 @@ LIB_DEPENDS-perl =	${FULLPKGNAME-main}:${FULLPKGPATH-main}
 WANTLIB-perl =		perl gdal # uses perl ABI
 WANTLIB-perl += c crypto curl expat freexl geos_c geotiff gif iconv
 WANTLIB-perl += jasper jpeg json-c lzma m nghttp2 openjp2 pcre png
-WANTLIB-perl += pq pthread qhull spatialite sqlite3 ssl tiff xml2 webp z zstd
+WANTLIB-perl += pq proj pthread qhull spatialite sqlite3 ssl tiff xml2 webp z zstd
 
 BUILD_DEPENDS +=	${RUN_DEPENDS} math/py-numpy${MODPY_FLAVOR} devel/swig
 
@@ -88,7 +85,7 @@ TEST_DEPENDS +=		${FULLPKGNAME-python}:${FULLPKGPATH-python}
 TEST_ENV =		GDAL_DOWNLOAD_TEST_DATA=1 GDAL_RUN_SLOW_TESTS=yes
 
 MODPY_SETUPTOOLS =	Yes
-MODPY_EGG_VERSION =	${V:C/beta.//}
+MODPY_EGG_VERSION =	${V}
 MODPY_ADJ_FILES =	swig/python/scripts/*.py swig/python/samples/*.py
 
 MAKE_FILE =	GNUmakefile
@@ -111,7 +108,7 @@ CONFIGURE_ARGS =--without-hdf5 \
 		--without-idb \
 		--without-sde \
 		--without-libgrass \
-		--with-pg=${LOCALBASE}/bin/pg_config \
+		--with-pg \
 		--with-python=${MODPY_BIN} \
 		--with-perl \
 		--with-geos \
diff --git a/geo/gdal/distinfo b/geo/gdal/distinfo
index db300ccafae..9312c5f2152 100644
--- a/geo/gdal/distinfo
+++ b/geo/gdal/distinfo
@@ -1,4 +1,4 @@
-SHA256 (gdal-2.4.1.tar.gz) = 8aEdGYIgW55MwQ4W8BalVZv8n6mp6mkBXpnM1qc46kw=
-SHA256 (gdalautotest-2.4.1.tar.gz) = znCAd5LzX2bw89+g4tQQcb+EXZtlzr2XJ5Ygz5CjBgM=
-SIZE (gdal-2.4.1.tar.gz) = 14546610
-SIZE (gdalautotest-2.4.1.tar.gz) = 30218240
+SHA256 (gdal-3.0.0.tar.gz) = mY5u9cau4h6l8eD96Os1+pgQjZvLDfaJ/CJALZy3L6k=
+SHA256 (gdalautotest-3.0.0.tar.gz) = dQ1KPyXB9bCVoP/5pSloCnH030aVmtfTD1TBrkCs4gs=
+SIZE (gdal-3.0.0.tar.gz) = 14155670
+SIZE (gdalautotest-3.0.0.tar.gz) = 31641600
diff --git a/geo/gdal/patches/patch-swig_python_setup_py b/geo/gdal/patches/patch-swig_python_setup_py
index 2620a9ff59a..7d8ba9da580 100644
--- a/geo/gdal/patches/patch-swig_python_setup_py
+++ b/geo/gdal/patches/patch-swig_python_setup_py
@@ -1,9 +1,9 @@
-$OpenBSD: patch-swig_python_setup_py,v 1.12 2018/12/28 08:53:59 landry Exp $
+$OpenBSD: patch-swig_python_setup_py,v 1.13 2019/05/12 08:07:33 landry Exp $
 
 Index: swig/python/setup.py
 --- swig/python/setup.py.orig
 +++ swig/python/setup.py
-@@ -300,7 +300,7 @@ class gdal_ext(build_ext):
+@@ -324,7 +324,7 @@ class gdal_ext(build_ext):
          return build_ext.build_extension(self, ext)
  
  
@@ -11,4 +11,4 @@ Index: swig/python/setup.py
 +extra_link_args = ['-fPIC']
  extra_compile_args = []
  
- if sys.platform == 'darwin' and [int(x) for x in os.uname()[2].split('.')] >= [11, 0, 0]:
+ gdal_module = Extension('osgeo._gdal',
diff --git a/geo/gdal/pkg/PLIST-main b/geo/gdal/pkg/PLIST-main
index d6bdc9025d8..9e8779db1c6 100644
--- a/geo/gdal/pkg/PLIST-main
+++ b/geo/gdal/pkg/PLIST-main
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-main,v 1.18 2018/12/28 08:53:59 landry Exp $
+@comment $OpenBSD: PLIST-main,v 1.19 2019/05/12 08:07:33 landry Exp $
 @conflict gdal-<=1.8.0
 @pkgpath geo/gdal
 bin/gdal-config
@@ -128,25 +128,14 @@ share/gdal/GDALLogoColor.svg
 share/gdal/GDALLogoGS.svg
 share/gdal/LICENSE.TXT
 share/gdal/bag_template.xml
-share/gdal/compdcs.csv
-share/gdal/coordinate_axis.csv
 share/gdal/cubewerx_extra.wkt
-share/gdal/datum_shift.csv
 share/gdal/default.rsc
 share/gdal/ecw_cs.wkt
 share/gdal/eedaconf.json
-share/gdal/ellipsoid.csv
 share/gdal/epsg.wkt
 share/gdal/esri_StatePlane_extra.wkt
-share/gdal/esri_Wisconsin_extra.wkt
-share/gdal/esri_epsg.wkt
-share/gdal/esri_extra.wkt
-share/gdal/gcs.csv
-share/gdal/gcs.override.csv
-share/gdal/gdal_datum.csv
 share/gdal/gdalicon.png
 share/gdal/gdalvrt.xsd
-share/gdal/geoccs.csv
 share/gdal/gml_registry.xml
 share/gdal/gmlasconf.xml
 share/gdal/gmlasconf.xsd
@@ -193,12 +182,9 @@ share/gdal/ozi_datum.csv
 share/gdal/ozi_ellips.csv
 share/gdal/pci_datum.txt
 share/gdal/pci_ellips.txt
-share/gdal/pcs.csv
-share/gdal/pcs.override.csv
+share/gdal/pdfcomposition.xsd
 share/gdal/pds4_template.xml
 share/gdal/plscenesconf.json
-share/gdal/prime_meridian.csv
-share/gdal/projop_wparm.csv
 share/gdal/ruian_vf_ob_v1.gfs
 share/gdal/ruian_vf_st_uvoh_v1.gfs
 share/gdal/ruian_vf_st_v1.gfs
@@ -211,8 +197,5 @@ share/gdal/seed_2d.dgn
 share/gdal/seed_3d.dgn
 share/gdal/stateplane.csv
 share/gdal/trailer.dxf
-share/gdal/unit_of_measure.csv
 share/gdal/vdv452.xml
 share/gdal/vdv452.xsd
-share/gdal/vertcs.csv
-share/gdal/vertcs.override.csv
diff --git a/geo/gdal/pkg/PLIST-python b/geo/gdal/pkg/PLIST-python
index 3bd2ad6d84f..9d0df61c01c 100644
--- a/geo/gdal/pkg/PLIST-python
+++ b/geo/gdal/pkg/PLIST-python
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-python,v 1.15 2019/02/13 12:46:42 landry Exp $
+@comment $OpenBSD: PLIST-python,v 1.16 2019/05/12 08:07:33 landry Exp $
 bin/epsg_tr${MODPY_BIN_SUFFIX}.py
 bin/esri2wkt${MODPY_BIN_SUFFIX}.py
 bin/gcps2vec${MODPY_BIN_SUFFIX}.py
@@ -91,6 +91,7 @@ share/examples/${MODPY_PY_PREFIX}gdal/fix_gpkg.py
 share/examples/${MODPY_PY_PREFIX}gdal/gcps2ogr.py
 share/examples/${MODPY_PY_PREFIX}gdal/gdal2grd.py
 share/examples/${MODPY_PY_PREFIX}gdal/gdal_cp.py
+share/examples/${MODPY_PY_PREFIX}gdal/gdal_create_pdf.py
 share/examples/${MODPY_PY_PREFIX}gdal/gdal_ls.py
 share/examples/${MODPY_PY_PREFIX}gdal/gdal_lut.py
 share/examples/${MODPY_PY_PREFIX}gdal/gdal_mkdir.py