diff --git a/geo/gpx-viewer/Makefile b/geo/gpx-viewer/Makefile
index 1d5ceddba7a..34ffd698804 100644
--- a/geo/gpx-viewer/Makefile
+++ b/geo/gpx-viewer/Makefile
@@ -2,7 +2,7 @@ COMMENT =	gpx file viewer
 
 VERSION =	0.4.0
 DISTNAME =	gpx-viewer-${VERSION}
-REVISION =	16
+REVISION =	17
 
 CATEGORIES =	geo x11
 
@@ -12,18 +12,19 @@ MAINTAINER =	Landry Breuil <landry@openbsd.org>
 # GPLv2
 PERMIT_PACKAGE =	Yes
 
-WANTLIB += EGL X11 X11-xcb Xcomposite Xcursor Xdamage Xext Xfixes Xi
-WANTLIB += Xinerama Xrandr Xrender atk-1.0 atk-bridge-2.0 c cairo
-WANTLIB += cairo-gobject champlain-0.12 champlain-gtk-0.12 clutter-1.0
-WANTLIB += clutter-gtk-1.0 cogl cogl-pango cogl-path drm epoxy expat ffi
-WANTLIB += fontconfig freetype fribidi gbm gdk-3 gdk_pixbuf-2.0 gdl-3
-WANTLIB += gio-2.0 glapi glib-2.0 gmodule-2.0 gobject-2.0 graphite2
-WANTLIB += gthread-2.0 gtk-3 harfbuzz iconv idn2 intl json-glib-1.0 lzma
-WANTLIB += m pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre2-8 pixman-1 png psl
-WANTLIB += pthread soup-2.4 sqlite3 unistring xcb xcb-dri2 xcb-dri3
-WANTLIB += xcb-present xcb-render xcb-shm xcb-sync xcb-xfixes xml2
-WANTLIB += xshmfence z Xau Xdmcp brotlicommon brotlidec execinfo jpeg
-WANTLIB += ${COMPILER_LIBCXX}
+WANTLIB += ${COMPILER_LIBCXX} EGL X11 X11-xcb Xau Xcomposite Xcursor
+WANTLIB += Xdamage Xdmcp Xext Xfixes Xi Xinerama Xrandr Xrender
+WANTLIB += atk-1.0 atk-bridge-2.0 atspi brotlicommon brotlidec
+WANTLIB += c cairo cairo-gobject champlain-0.12 champlain-gtk-0.12
+WANTLIB += clutter-1.0 clutter-gtk-1.0 cogl cogl-pango cogl-path
+WANTLIB += dbus-1 drm epoxy execinfo expat ffi fontconfig freetype
+WANTLIB += fribidi gbm gdk-3 gdk_pixbuf-2.0 gdl-3 gio-2.0 glapi
+WANTLIB += glib-2.0 gmodule-2.0 gobject-2.0 graphite2 gthread-2.0
+WANTLIB += gtk-3 harfbuzz iconv idn2 intl jpeg json-glib-1.0 lzma
+WANTLIB += m nghttp2 pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre2-8
+WANTLIB += pixman-1 png psl soup-3.0 sqlite3 unistring xcb xcb-dri2
+WANTLIB += xcb-dri3 xcb-present xcb-render xcb-shm xcb-sync xcb-xfixes
+WANTLIB += xml2 xshmfence z
 
 MASTER_SITES =	http://edge.launchpad.net/gpx-viewer/trunk/${VERSION}/+download/
 
diff --git a/productivity/lifeograph/Makefile b/productivity/lifeograph/Makefile
index 899f3a405dc..191922c4a42 100644
--- a/productivity/lifeograph/Makefile
+++ b/productivity/lifeograph/Makefile
@@ -6,15 +6,15 @@ HOMEPAGE=	http://lifeograph.sourceforge.net
 
 V=		2.0.2
 DISTNAME=	lifeograph-${V}
-REVISION=	1
+REVISION=	2
 
 # GPLv3+
 PERMIT_PACKAGE=	Yes
 
-WANTLIB+= 	${COMPILER_LIBCXX} cairomm-1.0 gio-2.0 enchant-2
-WANTLIB+= 	giomm-2.4 glib-2.0 glibmm-2.4 gobject-2.0 gtk-3 gtkmm-3.0
-WANTLIB+= 	pangomm-1.4 sigc-2.0 atkmm-1.6 c gdkmm-3.0 intl m gcrypt
-WANTLIB+=	champlain-0.12 champlain-gtk-0.12 clutter-1.0 clutter-gtk-1.0
+WANTLIB += ${COMPILER_LIBCXX} atkmm-1.6 c cairomm-1.0 champlain-0.12
+WANTLIB += champlain-gtk-0.12 clutter-1.0 clutter-gtk-1.0 enchant-2
+WANTLIB += gcrypt gdkmm-3.0 gio-2.0 giomm-2.4 glib-2.0 glibmm-2.4
+WANTLIB += gobject-2.0 gtk-3 gtkmm-3.0 intl m pangomm-1.4 sigc-2.0
 
 MASTER_SITES= 	https://launchpad.net/lifeograph/trunk/${V}/+download/