diff --git a/graphics/mapnik/Makefile b/graphics/mapnik/Makefile
index 30d608c78a548..02a15f0f5a0b7 100644
--- a/graphics/mapnik/Makefile
+++ b/graphics/mapnik/Makefile
@@ -1,14 +1,16 @@
 PORTNAME=	mapnik
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.1.0
-PORTREVISION=	3
+PORTREVISION=  4
 CATEGORIES=	graphics geography
 MASTER_SITES=	https://github.com/mapnik/mapnik/releases/download/${DISTVERSIONFULL}/
 
-PATCH_SITES=	https://github.com/mapnik/mapnik/commit/
+PATCH_SITES=	https://github.com/mapnik/mapnik/commit/ \
+		https://gitlab.archlinux.org/archlinux/packaging/packages/mapnik/-/raw/f9f723222c0af50e4db747e7c4e8138dbc769f53/
 PATCHFILES=	8944e81367d2b3b91a41e24116e1813c01491e5d.patch \
 		83779b7b6bdd229740b1b5e12a4a8fe27114cb7d.patch \
-		7f0daee8b37d8cf6eff32529b1762ffd5104f3f3.patch
+		7f0daee8b37d8cf6eff32529b1762ffd5104f3f3.patch \
+		boost-1.83.patch
 PATCH_DIST_STRIP=	-p1 -F3
 
 MAINTAINER=	david.hummel@gmail.com
@@ -19,7 +21,10 @@ LICENSE=	LGPL21+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${LOCALBASE}/share/fonts/dejavu/DejaVuSans.ttf:x11-fonts/dejavu
-LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
+LIB_DEPENDS=	libboost_filesystem.so:devel/boost-libs \
+		libboost_program_options.so:devel/boost-libs \
+		libboost_regex.so:devel/boost-libs \
+		libboost_system.so:devel/boost-libs \
 		libfreetype.so:print/freetype2 \
 		libharfbuzz.so:print/harfbuzz \
 		libicuuc.so:devel/icu
@@ -37,8 +42,8 @@ CONFIGURE_ARGS=	CPP_TESTS=False \
 		CUSTOM_LDFLAGS="${LDFLAGS}" \
 		DEMO=False \
 		DESTDIR="${STAGEDIR}" \
-		FAST=True \
 		INPUT_PLUGINS="`${ECHO} ${INPUT_PLUGINS} | ${TR} ' ' ,`" \
+		PGSQL2SQLITE=True \
 		SVG2PNG=True \
 		SYSTEM_FONTS=${LOCALBASE}/share/fonts/dejavu \
 		XMLPARSER=libxml2
@@ -75,7 +80,7 @@ POSTGIS_USES=		pgsql
 PGRASTER_VARS=		INPUT_PLUGINS+=pgraster
 PGRASTER_USES=		pgsql
 SQLITE3_VARS=		INPUT_PLUGINS+=sqlite
-SQLITE3_LIB_DEPENDS=	libsqlite3.so:databases/sqlite3
+SQLITE3_USES=		sqlite:3
 
 PNG_LIB_DEPENDS=	libpng.so:graphics/png
 PNG_MAKE_ARGS_OFF=	PNG=False
@@ -110,6 +115,7 @@ post-patch:
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/mapnik-index \
 		${STAGEDIR}${PREFIX}/bin/mapnik-render \
+		${STAGEDIR}${PREFIX}/bin/pgsql2sqlite \
 		${STAGEDIR}${PREFIX}/bin/shapeindex \
 		${STAGEDIR}${PREFIX}/bin/svg2png
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so
diff --git a/graphics/mapnik/distinfo b/graphics/mapnik/distinfo
index df164881b392d..d5f8a9c6102a5 100644
--- a/graphics/mapnik/distinfo
+++ b/graphics/mapnik/distinfo
@@ -7,3 +7,5 @@ SHA256 (83779b7b6bdd229740b1b5e12a4a8fe27114cb7d.patch) = c80ca2cded88dfebff4efc
 SIZE (83779b7b6bdd229740b1b5e12a4a8fe27114cb7d.patch) = 698
 SHA256 (7f0daee8b37d8cf6eff32529b1762ffd5104f3f3.patch) = 2bb3ab61ed128fd5ae48e8e0943d8d0ae37b070418c21774ba987a4973f21800
 SIZE (7f0daee8b37d8cf6eff32529b1762ffd5104f3f3.patch) = 1071
+SHA256 (boost-1.83.patch) = 356271f4550c2b370ae48bbce9cebb58c5803507f2b14bc8e84f3813871d0645
+SIZE (boost-1.83.patch) = 1704
diff --git a/graphics/mapnik/pkg-plist b/graphics/mapnik/pkg-plist
index ad33d31d5aad3..461d9cc6d3009 100644
--- a/graphics/mapnik/pkg-plist
+++ b/graphics/mapnik/pkg-plist
@@ -1,6 +1,7 @@
 bin/mapnik-config
 bin/mapnik-index
 bin/mapnik-render
+bin/pgsql2sqlite
 bin/shapeindex
 bin/svg2png
 include/mapnik/agg/agg_alpha_mask_u8.h