diff --git a/x11/wxWidgets/Makefile b/x11/wxWidgets/Makefile
index c0fcdb96cb2..23ede70b9ee 100644
--- a/x11/wxWidgets/Makefile
+++ b/x11/wxWidgets/Makefile
@@ -1,19 +1,19 @@
-COMMENT-main =	C++ cross-platform GUI toolkit
-COMMENT-media =	wxMediaCtrl class for wxWidgets
-COMMENT-webkit = wxWebView class for wxWidgets
+COMMENT-main =		C++ cross-platform GUI toolkit
+COMMENT-media =		wxMediaCtrl class for wxWidgets
+COMMENT-webkit =	wxWebView class for wxWidgets
 
-V =		3.0.5.1
-REVISION-main =	4
-REVISION-media = 1
-REVISION-webkit = 2
-DISTNAME =	wxWidgets-${V}
-PKGNAME-main =	wxWidgets-gtk3-${V}
-PKGNAME-media =	wxWidgets-media-${V}
-PKGNAME-webkit = wxWidgets-webkit-${V}
+V =			3.0.5.1
+REVISION-main =		4
+REVISION-media =	1
+REVISION-webkit =	2
+DISTNAME =		wxWidgets-${V}
+PKGNAME-main =		wxWidgets-gtk3-${V}
+PKGNAME-media =		wxWidgets-media-${V}
+PKGNAME-webkit =	wxWidgets-webkit-${V}
 
-CATEGORIES =	x11
-MASTER_SITES =	https://github.com/wxWidgets/wxWidgets/releases/download/v$V/
-EXTRACT_SUFX =	.tar.bz2
+CATEGORIES =		x11
+MASTER_SITES =		https://github.com/wxWidgets/wxWidgets/releases/download/v$V/
+EXTRACT_SUFX =		.tar.bz2
 
 # XXX always keep those in sync, see SO_VERSION
 SHARED_LIBS +=  wx_baseu-3.0              0.1
@@ -33,30 +33,32 @@ SHARED_LIBS +=  wx_gtk3u_stc-3.0          0.1
 SHARED_LIBS +=  wx_gtk3u_xrc-3.0          0.1
 SHARED_LIBS +=  wx_gtk3u_webview-3.0      0.1
 
-HOMEPAGE =	https://www.wxwidgets.org/
+HOMEPAGE =		https://www.wxwidgets.org/
 
 # wxWindows (modified LGPL)
 # http://www.wxwidgets.org/about/licence/
 PERMIT_PACKAGE =	Yes
 
-MULTI_PACKAGES = -main -media -webkit
+MULTI_PACKAGES =	-main -media -webkit
 
 PSEUDO_FLAVORS =	no_webkit
 FLAVOR ?=
 .if ${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "arm" || \
 	${MACHINE_ARCH} == "hppa"
-FLAVOR += no_webkit
+FLAVOR +=		no_webkit
 .endif
 
 COMPILER =		base-clang ports-gcc base-gcc
 
+USE_GMAKE =		Yes
+
 MODULES	=		lang/python
 MODPY_RUNDEP =		No
 MODPY_ADJ_FILES =	src/stc/gen_iface.py
 
 BUILD_DEPENDS =		devel/cppunit
 LIB_DEPENDS =		x11/gtk+3
-TEST_DEPENDS = ${BUILD_PKGPATH}>=${V}
+TEST_DEPENDS =		${BUILD_PKGPATH}>=${V}
 
 LIB_DEPENDS-main =	${LIB_DEPENDS} \
 			archivers/libmspack \
@@ -88,42 +90,41 @@ WANTLIB-webkit += gtk-3 harfbuzz iconv intl jpeg javascriptcoregtk-4.0 m notify
 WANTLIB-webkit += pango-1.0 pangocairo-1.0 png soup-2.4 tiff webkit2gtk-4.0
 WANTLIB-webkit += wx_baseu-3.0 wx_gtk3u_core-3.0 z gmodule-2.0
 
-DEBUG_PACKAGES=${BUILD_PACKAGES}
+DEBUG_PACKAGES=		${BUILD_PACKAGES}
 
-MAKE_FLAGS =	SO_VERSION="${LIBwx_baseu-3.0_VERSION}"
+MAKE_FLAGS =		SO_VERSION="${LIBwx_baseu-3.0_VERSION}"
 
-FIX_CRLF_FILES=	src/stc/gen_iface.py
+FIX_CRLF_FILES=		src/stc/gen_iface.py
 
-USE_GMAKE =	Yes
-CONFIGURE_STYLE=gnu
-CONFIGURE_ARGS =--disable-backtrace \
-		--enable-graphics_ctx \
-		--enable-mediactrl \
-		--enable-protocols \
-		--enable-protocol-http \
-		--enable-unicode \
-		--with-gtk=3 \
-		--with-libmspack \
-		--with-opengl \
-		--with-sdl
+CONFIGURE_STYLE =	gnu
+CONFIGURE_ARGS =	--disable-backtrace \
+			--enable-graphics_ctx \
+			--enable-mediactrl \
+			--enable-protocols \
+			--enable-protocol-http \
+			--enable-unicode \
+			--with-gtk=3 \
+			--with-libmspack \
+			--with-opengl \
+			--with-sdl
 
 .include <bsd.port.arch.mk>
 
 .if !${BUILD_PACKAGES:M-webkit}
-CONFIGURE_ARGS += --disable-webviewwebkit
+CONFIGURE_ARGS +=	--disable-webviewwebkit
 .endif
 
-CONFIGURE_ENV =	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
-		WXCONFIG_CPPFLAGS="-I${X11BASE}/include" \
-		WXCONFIG_LDFLAGS_GUI="-L${X11BASE}/lib"
+CONFIGURE_ENV =		CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
+			LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
+			WXCONFIG_CPPFLAGS="-I${X11BASE}/include" \
+			WXCONFIG_LDFLAGS_GUI="-L${X11BASE}/lib"
 
 # XXX: When used in conjunction with PIE, symbol versioning triggers
 # weird linking problems in dependent ports
-CONFIGURE_ENV += wx_cv_version_script=no
+CONFIGURE_ENV +=	wx_cv_version_script=no
 
 .ifdef DEBUG
-CONFIGURE_ARGS += --enable-debug
+CONFIGURE_ARGS +=	--enable-debug
 .endif
 
 pre-configure: