diff --git a/archivers/lizard/Makefile b/archivers/lizard/Makefile
index 8538851beab0..721370fe0976 100644
--- a/archivers/lizard/Makefile
+++ b/archivers/lizard/Makefile
@@ -1,27 +1,27 @@
 # $FreeBSD$
 
 PORTNAME=	lizard
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.0
 CATEGORIES=	archivers
 
-MAINTAINER=	tagattie@yandex.com
+MAINTAINER=	tagattie@FreeBSD.org
 COMMENT=	Efficient compressor with very fast decompression
 
 LICENSE=	BSD2CLAUSE GPLv2
 LICENSE_COMB=	multi
 LICENSE_FILE_BSD2CLAUSE=	${WRKSRC}/lib/LICENSE
 LICENSE_FILE_GPLv2=	${WRKSRC}/programs/COPYING
 
 USES=		gmake
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	inikep
 
 USE_LDCONFIG=	yes
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/lizard \
 		${STAGEDIR}/${PREFIX}/lib/liblizard.so.1.0.0
 
 .include <bsd.port.mk>
diff --git a/audio/vgmplay/Makefile b/audio/vgmplay/Makefile
index e99d1e738805..da831a0da064 100644
--- a/audio/vgmplay/Makefile
+++ b/audio/vgmplay/Makefile
@@ -1,56 +1,56 @@
 # $FreeBSD$
 
 PORTNAME=	vgmplay
 PORTVERSION=	0.40.9
 PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	https://github.com/vgmrips/${PORTNAME}/releases/download/${PORTVERSION}/
 DISTNAME=	${PORTNAME:S/vgmp/VGMP/}_${PORTVERSION:S/.//:S/./-/}_src
 
-MAINTAINER=	tagattie@yandex.com
+MAINTAINER=	tagattie@FreeBSD.org
 COMMENT=	Command-line player for VGM (video game music) files
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/licenses/GPL.txt
 
 USES=		7z compiler dos2unix gmake
 
 NO_WRKSUBDIR=	yes
 
 OPTIONS_SINGLE=	AUDIO
 OPTIONS_SINGLE_AUDIO=	OSS LIBAO
 OPTIONS_DEFAULT=	OSS
 
 OSS_DESC=	Use OSS (/dev/dsp)
 LIBAO_DESC=	Use libao
 
 OSS_MAKE_ENV+=	USE_LIBAO=0
 LIBAO_MAKE_ENV+=	USE_LIBAO=1
 LIBAO_LIB_DEPENDS=	libao.so:audio/libao
 LIBAO_USES=	localbase:ldflags
 
 MAKE_ENV+=	PREFIX=${LOCALBASE} ${MAKE_ENV_${ARCH}}
 MAKE_ENV_powerpc64=	BYTE_ORDER=2
 MAKE_ENV_powerpc=	BYTE_ORDER=2
 MAKE_ENV_powerpcspe=	BYTE_ORDER=2
 
 PLIST_FILES=	bin/vgmplay bin/vgm2pcm bin/vgm2wav man/man1/vgmplay.1.gz ${EXAMPLESDIR}/vgmplay.ini
 
 .include <bsd.port.pre.mk>
 
 post-patch:
 	${REINPLACE_CMD} -e 's/@//' ${WRKSRC}/Makefile
 .if ${CHOSEN_COMPILER_TYPE} != clang
 	${REINPLACE_CMD} -e 's/-Wno-unused-but-set-variable//' ${WRKSRC}/Makefile
 .endif
 	${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|; s|/usr/share/vgmplay|${EXAMPLESDIR}|; s|VGMPlay|vgmplay|g;' ${WRKSRC}/vgmplay.1
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/vgmplay ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/vgm2pcm ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/vgm2wav ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/vgmplay.1 ${STAGEDIR}${PREFIX}/man/man1
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/VGMPlay.ini ${STAGEDIR}${EXAMPLESDIR}/vgmplay.ini
 
 .include <bsd.port.post.mk>
diff --git a/comms/scrcpy/Makefile b/comms/scrcpy/Makefile
index 67174942b377..98cdd11ece4b 100644
--- a/comms/scrcpy/Makefile
+++ b/comms/scrcpy/Makefile
@@ -1,43 +1,43 @@
 # $FreeBSD$
 
 PORTNAME=	scrcpy
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.12.1
 CATEGORIES=	comms net
 MASTER_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/releases/download/${GH_TAGNAME}/:server
 DISTFILES=	${SERVER_FILE}:server
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
-MAINTAINER=	tagattie@yandex.com
+MAINTAINER=	tagattie@FreeBSD.org
 COMMENT=	Display and control your Android device
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg
 RUN_DEPENDS=	adb:devel/android-tools-adb
 
 USES=		compiler:c++11-lang meson pkgconfig sdl
 USE_SDL=	sdl2
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Genymobile
 
 MESON_ARGS=	-Dportable=false \
 		-Dprebuilt_server=${WRKSRC}/${SERVER_FILE}
 
 OPTIONS_DEFINE=	DOCS
 
 PORTDOCS=	README.md FAQ.md
 
 SERVER_FILE=	${PORTNAME}-server-${DISTVERSIONPREFIX}${DISTVERSION}
 PLIST_FILES=	bin/scrcpy man/man1/scrcpy.1.gz ${DATADIR}/scrcpy-server
 
 post-extract:
 	${CP} ${DISTDIR}/${SERVER_FILE} ${WRKSRC}
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_MAN} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/deskutils/meteo/Makefile b/deskutils/meteo/Makefile
index bd31b5728e70..2483e8e5a0e9 100644
--- a/deskutils/meteo/Makefile
+++ b/deskutils/meteo/Makefile
@@ -1,46 +1,46 @@
 # $FreeBSD$
 
 PORTNAME=	meteo
 PORTVERSION=	0.9.8
 CATEGORIES=	deskutils
 
-MAINTAINER=	tagattie@yandex.com
+MAINTAINER=	tagattie@FreeBSD.org
 COMMENT=	Weather forecast application using OpenWeatherMap API
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	appstream-util:devel/appstream-glib \
 		valac:lang/vala
 LIB_DEPENDS=	libappindicator3.so:devel/libappindicator \
 		libjson-glib-1.0.so:devel/json-glib \
 		libsoup-2.4.so:devel/libsoup \
 		libgeocode-glib.so:net/geocode-glib \
 		libwebkit2gtk-4.0.so:www/webkit2-gtk3
 
 USES=		compiler:c11 desktop-file-utils gettext gnome meson pkgconfig \
 		python:3.5+,build shebangfix
 
 USE_GITLAB=	yes
 GL_ACCOUNT=	bitseater
 GL_COMMIT=	2c90bd8ab6d07c8c72e61efc03f90aa4d809e8e0
 
 USE_GNOME=	gtk30
 
 SHEBANG_FILES=	meson/post_install.py
 
 GLIB_SCHEMAS=	com.gitlab.bitseater.meteo.gschema.xml
 INSTALLS_ICONS=	yes
 
 PORTDOCS=	AUTHORS CONTRIBUTING.md CREDITS.md README.md changelog
 
 OPTIONS_DEFINE=	DOCS
 
 post-extract:
 	@${MV} ${WRKSRC}/debian/changelog ${WRKSRC}
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_MAN} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/deskutils/noti/Makefile b/deskutils/noti/Makefile
index 3455a78a90e1..ed170495b71e 100644
--- a/deskutils/noti/Makefile
+++ b/deskutils/noti/Makefile
@@ -1,28 +1,28 @@
 # $FreeBSD$
 
 PORTNAME=	noti
 DISTVERSION=	3.4.0
 CATEGORIES=	deskutils
 
-MAINTAINER=	tagattie@yandex.com
+MAINTAINER=	tagattie@FreeBSD.org
 COMMENT=	Trigger notifications when a process completes
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	notify-send:devel/libnotify
 
 USES=		go:modules
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	variadico
 
 GO_TARGET=	./cmd/noti
 
 PLIST_FILES=	bin/noti man/man1/noti.1.gz man/man5/noti.yaml.5.gz
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/docs/man/noti.1 ${STAGEDIR}${MANPREFIX}/man/man1/noti.1
 	${INSTALL_MAN} ${WRKSRC}/docs/man/noti.yaml.5 ${STAGEDIR}${MANPREFIX}/man/man5/noti.yaml.5
 
 .include <bsd.port.mk>
diff --git a/devel/app-builder/Makefile b/devel/app-builder/Makefile
index 0a2b3a75d1c9..83f1160593a8 100644
--- a/devel/app-builder/Makefile
+++ b/devel/app-builder/Makefile
@@ -1,80 +1,80 @@
 # $FreeBSD$
 
 PORTNAME=	app-builder
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.4.2
 PORTREVISION=	1
 CATEGORIES=	devel
 
-MAINTAINER=	tagattie@yandex.com
+MAINTAINER=	tagattie@FreeBSD.org
 COMMENT=	Generic helper tool to build app in a distributable format
 
 LICENSE=	MIT
 
 BUILD_DEPENDS=	go-bindata:devel/go-bindata
 RUN_DEPENDS=	opj_decompress:graphics/openjpeg
 
 USES=		gmake go:modules
 
 USE_GITHUB=	yes
 USE_GITLAB=	nodefault
 
 GH_ACCOUNT=	develar
 GH_TUPLE=	aclements:go-rabin:d0b643ea1a4c:aclements_go_rabin/vendor/github.com/aclements/go-rabin \
 		alecthomas:kingpin:v2.2.6:alecthomas_kingpin/vendor/github.com/alecthomas/kingpin \
 		alecthomas:template:fb15b899a751:alecthomas_template/vendor/github.com/alecthomas/template \
 		alecthomas:units:c3de453c63f4:alecthomas_units/vendor/github.com/alecthomas/units \
 		alessio:shellescape:52074bc9df61:alessio_shellescape/vendor/gopkg.in/alessio/shellescape.v1 \
 		aws:aws-sdk-go:v1.21.3:aws_aws_sdk_go/vendor/github.com/aws/aws-sdk-go \
 		biessek:golang-ico:d348d9ea4670:biessek_golang_ico/vendor/github.com/biessek/golang-ico \
 		develar:errors:v0.9.0:develar_errors/vendor/github.com/develar/errors \
 		develar:go-fs-util:69a2d4542206:develar_go_fs_util/vendor/github.com/develar/go-fs-util \
 		develar:go-pkcs12:54baa4f32c6a:develar_go_pkcs12/vendor/github.com/develar/go-pkcs12 \
 		disintegration:imaging:v1.6.0:disintegration_imaging/vendor/github.com/disintegration/imaging \
 		dustin:go-humanize:v1.0.0:dustin_go_humanize/vendor/github.com/dustin/go-humanize \
 		fsnotify:fsnotify:v1.4.7:fsnotify_fsnotify/vendor/gopkg.in/fsnotify.v1 \
 		go-tomb:tomb:dd632973f1e7:go_tomb_tomb/vendor/gopkg.in/tomb.v1 \
 		go-yaml:yaml:v2.2.2:go_yaml_yaml/vendor/gopkg.in/yaml.v2 \
 		golang:image:d6a02ce849c9:golang_image/vendor/golang.org/x/image \
 		golang:net:ca1201d0de80:golang_net/vendor/golang.org/x/net \
 		golang:sys:fae7ac547cb7:golang_sys/vendor/golang.org/x/sys \
 		golang:text:v0.3.2:golang_text/vendor/golang.org/x/text \
 		hpcloud:tail:v1.0.0:hpcloud_tail/vendor/github.com/hpcloud/tail \
 		jmespath:go-jmespath:c2b33e8439af:jmespath_go_jmespath/vendor/github.com/jmespath/go-jmespath \
 		json-iterator:go:v1.1.6:json_iterator_go/vendor/github.com/json-iterator/go \
 		jsummers:gobmp:e2ba15ffa76e:jsummers_gobmp/vendor/github.com/jsummers/gobmp \
 		mattn:go-colorable:v0.1.2:mattn_go_colorable/vendor/github.com/mattn/go-colorable \
 		mattn:go-isatty:v0.0.8:mattn_go_isatty/vendor/github.com/mattn/go-isatty \
 		mcuadros:go-version:92cdf37c5b75:mcuadros_go_version/vendor/github.com/mcuadros/go-version \
 		minio:blake2b-simd:3f5f724cb5b1:minio_blake2b_simd/vendor/github.com/minio/blake2b-simd \
 		mitchellh:go-homedir:v1.1.0:mitchellh_go_homedir/vendor/github.com/mitchellh/go-homedir \
 		modern-go:concurrent:bacd9c7ef1dd:modern_go_concurrent/vendor/github.com/modern-go/concurrent \
 		modern-go:reflect2:v1.0.1:modern_go_reflect2/vendor/github.com/modern-go/reflect2 \
 		onsi:ginkgo:v1.8.0:onsi_ginkgo/vendor/github.com/onsi/ginkgo \
 		onsi:gomega:v1.5.0:onsi_gomega/vendor/github.com/onsi/gomega \
 		oxtoacart:bpool:03653db5a59c:oxtoacart_bpool/vendor/github.com/oxtoacart/bpool \
 		phayes:permbits:39d7c581d2ee:phayes_permbits/vendor/github.com/phayes/permbits \
 		pkg:errors:v0.8.1:pkg_errors/vendor/github.com/pkg/errors \
 		pkg:xattr:v0.4.1:pkg_xattr/vendor/github.com/pkg/xattr \
 		segmentio:ksuid:v1.0.2:segmentio_ksuid/vendor/github.com/segmentio/ksuid \
 		uber-go:atomic:v1.4.0:uber_go_atomic/vendor/go.uber.org/atomic \
 		uber-go:multierr:v1.1.0:uber_go_multierr/vendor/go.uber.org/multierr \
 		uber-go:zap:v1.10.0:uber_go_zap/vendor/go.uber.org/zap \
 		zieckey:goini:0da17d361d26:zieckey_goini/vendor/github.com/zieckey/goini
 
 GL_TUPLE=	https://gitlab.howett.net:go:plist:591f970eefbbeb04d7b37f334a0c4c3256e32876:go_plist/vendor/howett.net/plist
 
 PLIST_FILES=	bin/${PORTNAME}
 
 PORTDOCS=	readme.md
 
 OPTIONS_DEFINE=	DOCS
 
 pre-build:
 	cd ${WRKSRC} && ${MAKE_CMD} assets
 
 post-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_MAN} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/devel/electron4/Makefile b/devel/electron4/Makefile
index 62718e5dbd52..21fc6c632109 100644
--- a/devel/electron4/Makefile
+++ b/devel/electron4/Makefile
@@ -1,305 +1,305 @@
 # $FreeBSD$
 
 PORTNAME=	electron
 DISTVERSIONPREFIX=	v
 DISTVERSION=	${ELECTRON_VER:S/-beta./.b/}
 PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	https://github.com/tagattie/FreeBSD-Electron/releases/download/v4.1.0/:chromium \
 		https://commondatastorage.googleapis.com/chromium-browser-official/:chromium_official \
 		https://commondatastorage.googleapis.com/chromium-nodejs/:chromium_node \
 		https://commondatastorage.googleapis.com/chromium-fonts/:chromium_testfonts
 PKGNAMESUFFIX=	${ELECTRON_VER_MAJOR}
 DISTFILES=	chromium-${CHROMIUM_VER}${EXTRACT_SUFX}:chromium \
 		chromium-${CHROMIUM_OFFICIAL_VER}${EXTRACT_SUFX}:chromium_official \
 		${CHROMIUM_NODE_MODULES_HASH}:chromium_node \
 		${CHROMIUM_TEST_FONTS_HASH}:chromium_testfonts \
 		electron-npm-modules-${ELECTRON_VER}${EXTRACT_SUFX}:prefetch
 DIST_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	tagattie@yandex.com
+MAINTAINER=	tagattie@FreeBSD.org
 COMMENT=	Build cross-platform desktop apps with JavaScript, HTML, and CSS
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/electron/LICENSE
 
 FETCH_DEPENDS=	npm:www/npm-node10
 PATCH_DEPENDS=	git:devel/git
 BUILD_DEPENDS=	${LOCALBASE}/bin/ar:devel/binutils \
 		gperf:devel/gperf \
 		yasm:devel/yasm \
 		${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat \
 		node:www/node10 \
 		npm:www/npm-node10
 LIB_DEPENDS=	libatk-bridge-2.0.so:accessibility/at-spi2-atk \
 		libsnappy.so:archivers/snappy \
 		libFLAC.so:audio/flac \
 		libopus.so:audio/opus \
 		libdbus-1.so:devel/dbus \
 		libnotify.so:devel/libnotify \
 		libpci.so:devel/libpci \
 		libnspr4.so:devel/nspr \
 		libdrm.so:graphics/libdrm \
 		libwebp.so:graphics/webp \
 		libavcodec.so:multimedia/ffmpeg \
 		libopenh264.so:multimedia/openh264 \
 		libfreetype.so:print/freetype2 \
 		libharfbuzz.so:print/harfbuzz \
 		libsecret-1.so:security/libsecret \
 		libnss3.so:security/nss \
 		libexpat.so:textproc/expat2 \
 		libfontconfig.so:x11-fonts/fontconfig
 RUN_DEPENDS=	xdg-open:devel/xdg-utils
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}python-dbusmock>0:devel/py-python-dbusmock@${PY_FLAVOR} \
 		npm:www/npm-node10
 
 USES=		bison dos2unix gettext-tools gl gnome jpeg localbase:ldflags \
 		ninja pkgconfig python:2.7,build,test tar:xz xorg
 
 USE_GITHUB=	yes
 GH_TAGNAME=	${DISTVERSIONPREFIX}${ELECTRON_VER}
 # See ${WRKSRC}/electron/DEPS for GH_TAGNAME_node
 GH_TUPLE=	electron:node:8bc5d171a0873c0ba49f9433798bc8b67399788c:node
 		# boto:boto:f7574aa6cc2c819430c1f05e9a1a1a666ef8169b:boto \
 		# yaml:pyyaml:3.12:pyyaml \
 		# kennethreitz:requests:e4d59bedfd3c7f4f254f4f5d036587bcd8152458:requests
 
 # Official chromium version containing "gn" which is known to work
 CHROMIUM_OFFICIAL_VER=	76.0.3809.132
 # See ${WRKSRC}/electron/DEPS for CHROMIUM_VER
 CHROMIUM_VER=	69.0.3497.128
 # See ${WRKSRC}/third_party/node/node_modules.tar.gz.sha1 for CHROMIUM_NODE_MODULES_HASH
 CHROMIUM_NODE_MODULES_HASH=	050c85d20f7cedd7f5c39533c1ba89dcdfa56a08
 # See ${WRKSRC}/third_party/test_fonts/test_fonts.tar.gz.sha1 for CHROMIUM_TEST_FONTS_HASH
 CHROMIUM_TEST_FONTS_HASH=	a22de844e32a3f720d219e3911c3da3478039f89
 
 NO_WRKSUBDIR=	yes
 WRKSRC_SUBDIR=	src
 
 DATADIR=	${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX}
 
 DOS2UNIX_FILES=	third_party/skia/third_party/vulkanmemoryallocator/include/vk_mem_alloc.h
 BINARY_ALIAS=	python=${PYTHON_CMD}
 
 USE_XORG=	x11 xcb xcomposite xcursor xdamage xext xfixes xi xrandr \
 		xrender xscrnsaver xtst
 USE_GL=		gl glesv2
 USE_GNOME=	atk cairo pango gdkpixbuf2 gtk30 libxml2 libxslt
 USE_LDCONFIG=	${DATADIR}
 
 GN_ARGS+=	clang_use_chrome_plugins=false \
 		enable_hangout_services_extension=true \
 		enable_nacl=false \
 		enable_remoting=false \
 		fieldtrial_testing_like_official_build=true \
 		is_clang=true \
 		jumbo_file_merge_limit=8 \
 		toolkit_views=true \
 		treat_warnings_as_errors=false \
 		use_allocator="none" \
 		use_allocator_shim=false \
 		use_aura=true \
 		use_bundled_fontconfig=false \
 		use_custom_libcxx=false \
 		use_gnome_keyring=false \
 		use_jumbo_build=true \
 		use_lld=true \
 		use_sysroot=false \
 		use_system_freetype=true \
 		use_system_harfbuzz=true \
 		use_system_libjpeg=true \
 		extra_cxxflags="${CXXFLAGS}" \
 		extra_ldflags="${LDFLAGS}"
 GN_BOOTSTRAP_FLAGS=	--no-clean --no-rebuild --skip-generate-buildfiles
 
 ALL_TARGET=	electron third_party/electron_node:headers
 MAKE_ARGS=	-C out/${BUILDTYPE}
 MAKE_ENV+=	C_INCLUDE_PATH=${LOCALBASE}/include \
 		CPLUS_INCLUDE_PATH=${LOCALBASE}/include
 
 OPTIONS_DEFINE=	CUPS DEBUG DIST DRIVER KERBEROS
 DIST_DESC=	Build distribution zip files
 DRIVER_DESC=	Install chromedriver
 OPTIONS_GROUP=	AUDIO
 OPTIONS_GROUP_AUDIO=	ALSA PULSEAUDIO
 OPTIONS_DEFAULT=	CUPS DRIVER KERBEROS ALSA
 OPTIONS_SUB=	yes
 
 ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 ALSA_RUN_DEPENDS=	${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-plugins
 ALSA_VARS=	GN_ARGS+=use_alsa=true
 ALSA_VARS_OFF=	GN_ARGS+=use_alsa=false
 
 CUPS_LIB_DEPENDS=	libcups.so:print/cups
 CUPS_VARS=	GN_ARGS+=use_cups=true
 CUPS_VARS_OFF=	GN_ARGS+=use_cups=false
 
 DEBUG_VARS=	BUILDTYPE=Debug \
 		GN_ARGS+=is_component_build=false
 DEBUG_VARS_OFF=	BUILDTYPE=Release
 
 DIST_IMPLIES=	DRIVER
 
 DRIVER_ALL_TARGET=	chromedriver
 
 KERBEROS_VARS=	GN_ARGS+=use_kerberos=true
 KERBEROS_VARS_OFF=	GN_ARGS+=use_kerberos=false
 
 PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 PULSEAUDIO_VARS=	GN_ARGS+=use_pulseaudio=true
 PULSEAUDIO_VARS_OFF=	GN_ARGS+=use_pulseaudio=false
 
 POST_BUILD_TARGETS=	licenses version
 POST_BUILD_DIST_TARGETS=	electron_dist_zip electron_chromedriver_zip electron_mksnapshot_zip
 
 NPM_TIMESTAMP=	1573298347
 
 PLIST_SUB=	ELECTRON_VER=${ELECTRON_VER} \
 		ELECTRON_VER_MAJOR=${ELECTRON_VER_MAJOR}
 
 .include "Makefile.version"
 .include "Makefile.tests"
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "amd64"
 PLIST_SUB+=	AMD64=""
 .else
 PLIST_SUB+=	AMD64="@comment "
 .endif
 
 .if ${ARCH} == "i386"
 PLIST_SUB+=	I386=""
 .else
 PLIST_SUB+=	I386="@comment "
 .endif
 
 pre-fetch:
 	@${MKDIR} ${DISTDIR}/${DIST_SUBDIR}
 	if [ ! -f ${DISTDIR}/${DIST_SUBDIR}/electron-npm-modules-${ELECTRON_VER}${EXTRACT_SUFX} ]; \
 		then ${MKDIR} ${WRKDIR}/npm-cache; \
 		${CP} ${FILESDIR}/package.json \
 			${FILESDIR}/package-lock.json ${WRKDIR}/npm-cache; \
 		cd ${WRKDIR}/npm-cache && \
 		${SETENV} HOME=${WRKDIR} npm ci --verbose --no-progress && \
 		${MV} node_modules npm_modules; \
 		${MTREE_CMD} -cbnSp npm_modules | ${MTREE_CMD} -C | ${SED} \
 			-e 's:time=[0-9.]*:time=${NPM_TIMESTAMP}.000000000:' \
 			-e 's:\([gu]id\)=[0-9]*:\1=0:g' \
 			-e 's:flags=.*:flags=none:' \
 			-e 's:^\.:./npm_modules:' > npm_modules.mtree; \
 		${TAR} cJf ${DISTDIR}/${DIST_SUBDIR}/electron-npm-modules-${ELECTRON_VER}${EXTRACT_SUFX} \
 			@npm_modules.mtree; \
 		${RM} -r ${WRKDIR}/npm-cache; \
 	fi
 
 post-extract:
 	${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/chromium-${CHROMIUM_VER} ${WRKSRC}
 	${RM} -r ${WRKSRC}/tools/gn
 	${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/chromium-${CHROMIUM_OFFICIAL_VER}/tools/gn \
 		${WRKSRC}/tools/gn
 	${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/${PORTNAME}-${ELECTRON_VER} ${WRKSRC}/electron
 	${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/${GH_PROJECT_node}-${GH_TAGNAME_node} \
 		${WRKSRC}/third_party/${GH_ACCOUNT_node}_${GH_PROJECT_node}
 	# ${RMDIR} ${WRKSRC}/electron/vendor/${GH_PROJECT_boto}
 	# ${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/${GH_PROJECT_boto}-${GH_TAGNAME_boto} \
 	# 	${WRKSRC}/electron/vendor/${GH_PROJECT_boto}
 	# ${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/${GH_PROJECT_pyyaml}-${GH_TAGNAME_pyyaml} \
 	# 	${WRKSRC}/electron/vendor/${GH_PROJECT_pyyaml}
 	# ${RMDIR} ${WRKSRC}/electron/vendor/${GH_PROJECT_requests}
 	# ${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/${GH_PROJECT_requests}-${GH_TAGNAME_requests} \
 	# 	${WRKSRC}/electron/vendor/${GH_PROJECT_requests}
 	${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/node_modules ${WRKSRC}/third_party/node
 	${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/test_fonts ${WRKSRC}/third_party/test_fonts
 	${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/npm_modules ${WRKSRC}/electron/node_modules
 
 pre-patch:
 	${SH} ${FILESDIR}/apply-electron-patches.sh ${WRKSRC}
 	# ${FIND} ${WRKSRC} -type f -name '*.orig' -print -delete
 	# ${FIND} ${WRKSRC} -type f -name '*~' -print -delete
 
 pre-configure:
 	# cd ${WRKSRC}/electron/vendor/${GH_PROJECT_boto} && \
 	# 	${PYTHON_CMD} setup.py build
 	# cd ${WRKSRC}/electron/vendor/${GH_PROJECT_requests} && \
 	# 	${PYTHON_CMD} setup.py build
 	# We used to remove bundled libraries to be sure that chromium uses
 	# system libraries and not shipped ones.
 	# cd ${WRKSRC} && ${PYTHON_CMD} \
 	#./build/linux/unbundle/remove_bundled_libraries.py [list of preserved]
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${PYTHON_CMD} \
 		./build/linux/unbundle/replace_gn_files.py --system-libraries \
 		ffmpeg flac freetype harfbuzz-ng libdrm libusb libwebp libxml \
 		libxslt openh264 opus snappy yasm || ${FALSE}
 
 do-configure:
 	# GN generator bootstrapping and generating ninja files
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} CC=${CC} CXX=${CXX} LD=${CXX} \
 		READELF=${READELF} AR=${AR} NM=${NM} ${PYTHON_CMD} \
 		./tools/gn/bootstrap/bootstrap.py ${GN_BOOTSTRAP_FLAGS}
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ./out/${BUILDTYPE}/gn gen out/${BUILDTYPE} \
 		--args='import("//electron/build/args/${BUILDTYPE:tl}.gn") ${GN_ARGS}'
 	# Setup nodejs dependency
 	${MKDIR} ${WRKSRC}/third_party/node/freebsd/node-freebsd-x64/bin
 	${LN} -sf ${LOCALBASE}/bin/node ${WRKSRC}/third_party/node/freebsd/node-freebsd-x64/bin/node
 
 # do-build:
 # 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ninja -C out/${BUILDTYPE} ${ALL_TARGET}
 
 post-build:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
 		${MAKE_CMD} ${MAKE_ARGS} ${POST_BUILD_TARGETS}
 
 post-build-DIST-on:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
 		${MAKE_CMD} ${MAKE_ARGS} ${POST_BUILD_DIST_TARGETS}
 	cd ${WRKSRC}/out/${BUILDTYPE} && \
 		${CP} chromedriver.zip chromedriver-v${ELECTRON_VER}-freebsd-${ARCH:S/amd64/x64/:S/i386/ia32/}.zip && \
 		${CP} dist.zip electron-v${ELECTRON_VER}-freebsd-${ARCH:S/amd64/x64/:S/i386/ia32/}.zip && \
 		${CP} mksnapshot.zip mksnapshot-v${ELECTRON_VER}-freebsd-${ARCH:S/amd64/x64/:S/i386/ia32/}.zip && \
 		${SHA256} -r *-v${ELECTRON_VER}-freebsd-*.zip | ${SED} -e 's/ / */' > SHASUMS256.txt
 
 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}
 .for f in electron mksnapshot v8_context_snapshot_generator
 	${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/${f} ${STAGEDIR}${DATADIR}
 .endfor
 .for f in libEGL.so libGLESv2.so
 	${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/${f} ${STAGEDIR}${DATADIR}
 .endfor
 	${MKDIR} ${STAGEDIR}${DATADIR}/swiftshader
 .for f in libEGL.so libGLESv2.so
 	${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/swiftshader/${f} ${STAGEDIR}${DATADIR}/swiftshader
 .endfor
 .for f in LICENSE LICENSES.chromium.html icudtl.dat natives_blob.bin snapshot_blob.bin v8_context_snapshot.bin version
 	${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/${f} ${STAGEDIR}${DATADIR}
 .endfor
 .for f in chrome_100_percent.pak chrome_200_percent.pak resources.pak
 	${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/${f} ${STAGEDIR}${DATADIR}
 .endfor
 	${MKDIR} ${STAGEDIR}${DATADIR}/locales
 	${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/locales/*.pak ${STAGEDIR}${DATADIR}/locales
 	${MKDIR} ${STAGEDIR}${DATADIR}/resources
 .for f in default_app.asar electron.asar
 	${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/resources/${f} ${STAGEDIR}${DATADIR}/resources
 .endfor
 	cd ${WRKSRC}/out/${BUILDTYPE}/gen && ${COPYTREE_SHARE} node_headers ${STAGEDIR}${DATADIR}
 	${RLN} ${STAGEDIR}${DATADIR}/electron ${STAGEDIR}${PREFIX}/bin/electron${PKGNAMESUFFIX}
 
 post-install-DIST-on:
 	${MKDIR} ${STAGEDIR}${DATADIR}/releases
 	${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/SHASUMS256.txt ${STAGEDIR}${DATADIR}/releases
 	${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/*-v${ELECTRON_VER}-freebsd-*.zip ${STAGEDIR}${DATADIR}/releases
 
 post-install-DRIVER-on:
 	${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/chromedriver ${STAGEDIR}${DATADIR}
 
 do-test:
 	# Note 1: "npm install" will run before actual tests are executed
 	# Note 2: Xvfb or something similar is necessary for headless testing
 .for t in ${TEST_MODULES}
 	cd ${WRKSRC}/electron && \
 		${SETENV} ${TEST_ENV} ELECTRON_OUT_DIR=${BUILDTYPE} \
 		npm run test -- --ci -g '${t}' || ${TRUE}
 .endfor
 
 .include <bsd.port.post.mk>
diff --git a/devel/electron6/Makefile b/devel/electron6/Makefile
index 5b697105a9ab..f6a03bdedd81 100644
--- a/devel/electron6/Makefile
+++ b/devel/electron6/Makefile
@@ -1,320 +1,320 @@
 # $FreeBSD$
 
 PORTNAME=	electron
 DISTVERSIONPREFIX=	v
 DISTVERSION=	${ELECTRON_VER:S/-beta./.b/}
 PORTREVISION=	2
 CATEGORIES=	devel java
 MASTER_SITES=	https://github.com/tagattie/FreeBSD-Electron/releases/download/v6.0.9/:chromium \
 		https://commondatastorage.googleapis.com/chromium-browser-official/:chromium_official \
 		https://commondatastorage.googleapis.com/chromium-nodejs/:chromium_node \
 		https://commondatastorage.googleapis.com/chromium-fonts/:chromium_testfonts
 PKGNAMESUFFIX=	${ELECTRON_VER_MAJOR}
 DISTFILES=	chromium-${CHROMIUM_VER}${EXTRACT_SUFX}:chromium \
 		chromium-${CHROMIUM_OFFICIAL_VER}${EXTRACT_SUFX}:chromium_official \
 		${CHROMIUM_NODE_MODULES_HASH}:chromium_node \
 		${CHROMIUM_TEST_FONTS_HASH}:chromium_testfonts \
 		electron-yarn-cache-${ELECTRON_VER}${EXTRACT_SUFX}:prefetch
 DIST_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	tagattie@yandex.com
+MAINTAINER=	tagattie@FreeBSD.org
 COMMENT=	Build cross-platform desktop apps with JavaScript, HTML, and CSS
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/electron/LICENSE
 
 FETCH_DEPENDS=	yarn:www/yarn-node12
 EXTRACT_DEPENDS=	yarn:www/yarn-node12
 PATCH_DEPENDS=	git:devel/git
 BUILD_DEPENDS=	${LOCALBASE}/bin/ar:devel/binutils \
 		gperf:devel/gperf \
 		yasm:devel/yasm \
 		${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat \
 		node:www/node12 \
 		npm:www/npm-node12
 LIB_DEPENDS=	libatk-bridge-2.0.so:accessibility/at-spi2-atk \
 		libatspi.so:accessibility/at-spi2-core \
 		libsnappy.so:archivers/snappy \
 		libFLAC.so:audio/flac \
 		libopus.so:audio/opus \
 		libdbus-1.so:devel/dbus \
 		libnotify.so:devel/libnotify \
 		libpci.so:devel/libpci \
 		libnspr4.so:devel/nspr \
 		libre2.so:devel/re2 \
 		liblcms2.so:graphics/lcms2 \
 		libdrm.so:graphics/libdrm \
 		libwebp.so:graphics/webp \
 		libavcodec.so:multimedia/ffmpeg \
 		libvpx.so:multimedia/libvpx \
 		libopenh264.so:multimedia/openh264 \
 		libfreetype.so:print/freetype2 \
 		libharfbuzz.so:print/harfbuzz \
 		libsecret-1.so:security/libsecret \
 		libnss3.so:security/nss \
 		libexpat.so:textproc/expat2 \
 		libfontconfig.so:x11-fonts/fontconfig
 RUN_DEPENDS=	xdg-open:devel/xdg-utils
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}python-dbusmock>0:devel/py-python-dbusmock@${PY_FLAVOR} \
 		npm:www/npm-node12
 
 USES=		bison dos2unix gettext-tools gl gnome jpeg localbase:ldflags \
 		ninja pkgconfig python:2.7,build,test tar:xz xorg
 
 USE_GITHUB=	yes
 GH_TAGNAME=	${DISTVERSIONPREFIX}${ELECTRON_VER}
 GH_TUPLE=	nodejs:node:v${NODE_VER}:node
 		# boto:boto:f7574aa6cc2c819430c1f05e9a1a1a666ef8169b:boto \
 		# yaml:pyyaml:3.12:pyyaml \
 		# kennethreitz:requests:e4d59bedfd3c7f4f254f4f5d036587bcd8152458:requests
 
 # Official chromium version containing "gn" which is known to work
 CHROMIUM_OFFICIAL_VER=	76.0.3809.132
 # See ${WRKSRC}/electron/DEPS for CHROMIUM_VER
 CHROMIUM_VER=	76.0.3809.146
 # See ${WRKSRC}/third_party/node/node_modules.tar.gz.sha1 for CHROMIUM_NODE_MODULES_HASH
 CHROMIUM_NODE_MODULES_HASH=	2dd750e768cec597fc018509009637819ae4549c
 # See ${WRKSRC}/third_party/test_fonts/test_fonts.tar.gz.sha1 for CHROMIUM_TEST_FONTS_HASH
 CHROMIUM_TEST_FONTS_HASH=	a22de844e32a3f720d219e3911c3da3478039f89
 # See ${WRKSRC}/electron/DEPS for NODE_VER
 NODE_VER=	12.4.0
 
 NO_WRKSUBDIR=	yes
 WRKSRC_SUBDIR=	src
 
 DATADIR=	${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX}
 
 DOS2UNIX_FILES=	third_party/skia/third_party/vulkanmemoryallocator/include/vk_mem_alloc.h
 BINARY_ALIAS=	python=${PYTHON_CMD}
 
 USE_XORG=	x11 xcb xcomposite xcursor xdamage xext xfixes xi xrandr \
 		xrender xscrnsaver xtst
 USE_GL=		gl glesv2
 USE_GNOME=	atk cairo pango gdkpixbuf2 gtk30 libxml2 libxslt
 USE_JAVA=	yes
 JAVA_VERSION=	1.8
 JAVA_BUILD=	yes
 
 USE_LDCONFIG=	${DATADIR}
 
 GN_ARGS+=	clang_use_chrome_plugins=false \
 		enable_hangout_services_extension=true \
 		enable_nacl=false \
 		enable_one_click_signin=true \
 		enable_remoting=false \
 		fieldtrial_testing_like_official_build=true \
 		is_clang=true \
 		toolkit_views=true \
 		treat_warnings_as_errors=false \
 		use_allocator="none" \
 		use_allocator_shim=false \
 		use_aura=true \
 		use_custom_libcxx=false \
 		use_gnome_keyring=false \
 		use_jumbo_build=true \
 		use_lld=true \
 		use_sysroot=false \
 		use_system_freetype=true \
 		use_system_harfbuzz=true \
 		use_system_lcms2=true \
 		use_system_libdrm=true \
 		use_system_libjpeg=true \
 		extra_cxxflags="${CXXFLAGS}" \
 		extra_ldflags="${LDFLAGS}"
 GN_BOOTSTRAP_FLAGS=	--no-clean --no-rebuild --skip-generate-buildfiles
 
 ALL_TARGET=	electron third_party/electron_node:headers
 MAKE_ARGS=	-C out/${BUILDTYPE}
 MAKE_ENV+=	C_INCLUDE_PATH=${LOCALBASE}/include \
 		CPLUS_INCLUDE_PATH=${LOCALBASE}/include
 
 OPTIONS_DEFINE=	CUPS DEBUG DIST DRIVER KERBEROS
 DIST_DESC=	Build distribution zip files
 DRIVER_DESC=	Install chromedriver
 OPTIONS_GROUP=	AUDIO
 OPTIONS_GROUP_AUDIO=	ALSA PULSEAUDIO
 OPTIONS_DEFAULT=	CUPS DRIVER KERBEROS ALSA
 OPTIONS_SUB=	yes
 
 ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 ALSA_RUN_DEPENDS=	${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-plugins
 ALSA_VARS=	GN_ARGS+=use_alsa=true
 ALSA_VARS_OFF=	GN_ARGS+=use_alsa=false
 
 CUPS_LIB_DEPENDS=	libcups.so:print/cups
 CUPS_VARS=	GN_ARGS+=use_cups=true
 CUPS_VARS_OFF=	GN_ARGS+=use_cups=false
 
 DEBUG_VARS=	BUILDTYPE=Debug \
 		GN_ARGS+=is_component_build=false
 DEBUG_VARS_OFF=	BUILDTYPE=Release
 
 DIST_IMPLIES=	DRIVER
 
 DRIVER_ALL_TARGET=	chromedriver
 
 KERBEROS_VARS=	GN_ARGS+=use_kerberos=true
 KERBEROS_VARS_OFF=	GN_ARGS+=use_kerberos=false
 
 PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 PULSEAUDIO_VARS=	GN_ARGS+=use_pulseaudio=true
 PULSEAUDIO_VARS_OFF=	GN_ARGS+=use_pulseaudio=false
 
 POST_BUILD_TARGETS=	licenses version
 POST_BUILD_DIST_TARGETS=	electron_dist_zip electron_chromedriver_zip electron_mksnapshot_zip
 
 YARN_TIMESTAMP=	1582868122
 
 PLIST_SUB=	ELECTRON_VER=${ELECTRON_VER} \
 		ELECTRON_VER_MAJOR=${ELECTRON_VER_MAJOR}
 
 .include "Makefile.version"
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "amd64"
 PLIST_SUB+=	AMD64=""
 .else
 PLIST_SUB+=	AMD64="@comment "
 .endif
 
 .if ${ARCH} == "i386"
 PLIST_SUB+=	I386=""
 .else
 PLIST_SUB+=	I386="@comment "
 .endif
 
 pre-fetch:
 	@${MKDIR} ${DISTDIR}/${DIST_SUBDIR}
 	if [ ! -f ${DISTDIR}/${DIST_SUBDIR}/electron-yarn-cache-${ELECTRON_VER}${EXTRACT_SUFX} ]; \
 		then ${MKDIR} ${WRKDIR}; \
 		${ECHO_CMD} 'yarn-offline-mirror "./yarn-offline-cache"' >> \
 			${WRKDIR}/.yarnrc; \
 		${CP} ${FILESDIR}/package.json ${FILESDIR}/yarn.lock ${WRKDIR}; \
 		cd ${WRKDIR} && ${SETENV} HOME=${WRKDIR} XDG_CACHE_HOME=${WRKDIR}/.cache \
 			yarn --frozen-lockfile --ignore-scripts; \
 		${MTREE_CMD} -cbnSp yarn-offline-cache | ${MTREE_CMD} -C | ${SED} \
 			-e 's:time=[0-9.]*:time=${YARN_TIMESTAMP}.000000000:' \
 			-e 's:\([gu]id\)=[0-9]*:\1=0:g' \
 			-e 's:flags=.*:flags=none:' \
 			-e 's:^\.:./yarn-offline-cache:' > yarn-offline-cache.mtree; \
 		${TAR} cJf ${DISTDIR}/${DIST_SUBDIR}/electron-yarn-cache-${ELECTRON_VER}${EXTRACT_SUFX} \
 			@yarn-offline-cache.mtree; \
 		${RM} -r ${WRKDIR}; \
 	fi
 
 post-extract:
 	${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/chromium-${CHROMIUM_VER} ${WRKSRC}
 	${RM} -r ${WRKSRC}/tools/gn
 	${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/chromium-${CHROMIUM_OFFICIAL_VER}/tools/gn \
 		${WRKSRC}/tools/gn
 	${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/${PORTNAME}-${ELECTRON_VER} ${WRKSRC}/electron
 	${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/${GH_PROJECT_node}-${NODE_VER} \
 		${WRKSRC}/third_party/electron_node
 	${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/yarn-offline-cache ${WRKDIR}
 	${ECHO_CMD} 'yarn-offline-mirror "../../../yarn-offline-cache"' >> ${WRKSRC}/electron/.yarnrc
 	cd ${WRKSRC}/electron && \
 		${SETENV} HOME=${WRKDIR} XDG_CACHE_HOME=${WRKDIR}/.cache yarn --frozen-lockfile --offline
 	# ${RMDIR} ${WRKSRC}/electron/vendor/${GH_PROJECT_boto}
 	# ${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/${GH_PROJECT_boto}-${GH_TAGNAME_boto} \
 	# 	${WRKSRC}/electron/vendor/${GH_PROJECT_boto}
 	# ${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/${GH_PROJECT_pyyaml}-${GH_TAGNAME_pyyaml} \
 	# 	${WRKSRC}/electron/vendor/${GH_PROJECT_pyyaml}
 	# ${RMDIR} ${WRKSRC}/electron/vendor/${GH_PROJECT_requests}
 	# ${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/${GH_PROJECT_requests}-${GH_TAGNAME_requests} \
 	# 	${WRKSRC}/electron/vendor/${GH_PROJECT_requests}
 	${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/node_modules ${WRKSRC}/third_party/node
 	${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/test_fonts ${WRKSRC}/third_party/test_fonts
 
 pre-patch:
 	${SH} ${FILESDIR}/apply-electron-patches.sh ${WRKSRC}
 	# ${FIND} ${WRKSRC} -type f -name '*.orig' -print -delete
 	# ${FIND} ${WRKSRC} -type f -name '*~' -print -delete
 
 pre-configure:
 	# cd ${WRKSRC}/electron/vendor/${GH_PROJECT_boto} && \
 	# 	${PYTHON_CMD} setup.py build
 	# cd ${WRKSRC}/electron/vendor/${GH_PROJECT_requests} && \
 	# 	${PYTHON_CMD} setup.py build
 	# We used to remove bundled libraries to be sure that chromium uses
 	# system libraries and not shipped ones.
 	# cd ${WRKSRC} && ${PYTHON_CMD} \
 	#./build/linux/unbundle/remove_bundled_libraries.py [list of preserved]
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${PYTHON_CMD} \
 		./build/linux/unbundle/replace_gn_files.py --system-libraries \
 		ffmpeg flac fontconfig freetype harfbuzz-ng libdrm libjpeg \
 		libusb libvpx libwebp libxml libxslt openh264 opus re2 snappy \
 		yasm || ${FALSE}
 
 do-configure:
 	# GN generator bootstrapping and generating ninja files
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} CC=${CC} CXX=${CXX} LD=${CXX} \
 		READELF=${READELF} AR=${AR} NM=${NM} ${PYTHON_CMD} \
 		./tools/gn/bootstrap/bootstrap.py ${GN_BOOTSTRAP_FLAGS}
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ./out/${BUILDTYPE}/gn gen out/${BUILDTYPE} \
 		--args='import("//electron/build/args/${BUILDTYPE:tl}.gn") ${GN_ARGS}'
 	# Setup nodejs dependency
 	${MKDIR} ${WRKSRC}/third_party/node/freebsd/node-freebsd-x64/bin
 	${LN} -sf ${LOCALBASE}/bin/node ${WRKSRC}/third_party/node/freebsd/node-freebsd-x64/bin/node
 	# Setup java dependency
 	${MKDIR} ${WRKDIR}/bin
 	${LN} -sf ${LOCALBASE}/openjdk8/bin/java ${WRKDIR}/bin/java
 
 # do-build:
 # 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ninja -C out/${BUILDTYPE} ${ALL_TARGET}
 
 post-build:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
 		${MAKE_CMD} ${MAKE_ARGS} ${POST_BUILD_TARGETS}
 
 post-build-DIST-on:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
 		${MAKE_CMD} ${MAKE_ARGS} ${POST_BUILD_DIST_TARGETS}
 	cd ${WRKSRC}/out/${BUILDTYPE} && \
 		${CP} chromedriver.zip chromedriver-v${ELECTRON_VER}-freebsd-${ARCH:S/amd64/x64/:S/i386/ia32/}.zip && \
 		${CP} dist.zip electron-v${ELECTRON_VER}-freebsd-${ARCH:S/amd64/x64/:S/i386/ia32/}.zip && \
 		${CP} mksnapshot.zip mksnapshot-v${ELECTRON_VER}-freebsd-${ARCH:S/amd64/x64/:S/i386/ia32/}.zip && \
 		${SHA256} -r *-v${ELECTRON_VER}-freebsd-*.zip | ${SED} -e 's/ / */' > SHASUMS256.txt
 
 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}
 .for f in electron mksnapshot v8_context_snapshot_generator
 	${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/${f} ${STAGEDIR}${DATADIR}
 .endfor
 .for f in libEGL.so libGLESv2.so
 	${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/${f} ${STAGEDIR}${DATADIR}
 .endfor
 	${MKDIR} ${STAGEDIR}${DATADIR}/swiftshader
 .for f in libEGL.so libGLESv2.so
 	${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/swiftshader/${f} ${STAGEDIR}${DATADIR}/swiftshader
 .endfor
 .for f in LICENSE LICENSES.chromium.html icudtl.dat natives_blob.bin snapshot_blob.bin v8_context_snapshot.bin version
 	${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/${f} ${STAGEDIR}${DATADIR}
 .endfor
 .for f in chrome_100_percent.pak chrome_200_percent.pak resources.pak
 	${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/${f} ${STAGEDIR}${DATADIR}
 .endfor
 	${MKDIR} ${STAGEDIR}${DATADIR}/locales
 	${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/locales/*.pak ${STAGEDIR}${DATADIR}/locales
 	${MKDIR} ${STAGEDIR}${DATADIR}/resources
 .for f in default_app.asar electron.asar
 	${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/resources/${f} ${STAGEDIR}${DATADIR}/resources
 .endfor
 	cd ${WRKSRC}/out/${BUILDTYPE}/gen && ${COPYTREE_SHARE} node_headers ${STAGEDIR}${DATADIR}
 	${RLN} ${STAGEDIR}${DATADIR}/electron ${STAGEDIR}${PREFIX}/bin/electron${PKGNAMESUFFIX}
 
 post-install-DIST-on:
 	${MKDIR} ${STAGEDIR}${DATADIR}/releases
 	${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/SHASUMS256.txt ${STAGEDIR}${DATADIR}/releases
 	${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/*-v${ELECTRON_VER}-freebsd-*.zip ${STAGEDIR}${DATADIR}/releases
 
 post-install-DRIVER-on:
 	${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/chromedriver ${STAGEDIR}${DATADIR}
 
 do-test:
 	# Note 1: "npm install" will run before actual tests are executed
 	# Note 2: Xvfb or something similar is necessary for headless testing
 	cd ${WRKSRC}/electron && \
 		${SETENV} ${TEST_ENV} ELECTRON_OUT_DIR=${BUILDTYPE} \
 		npm run test -- --ci
 
 .include <bsd.port.post.mk>
diff --git a/devel/electron7/Makefile b/devel/electron7/Makefile
index a84e94040630..3f6c0218c299 100644
--- a/devel/electron7/Makefile
+++ b/devel/electron7/Makefile
@@ -1,322 +1,322 @@
 # $FreeBSD$
 
 PORTNAME=	electron
 DISTVERSIONPREFIX=	v
 DISTVERSION=	${ELECTRON_VER:S/-beta./.b/}
 PORTREVISION=	2
 CATEGORIES=	devel java
 MASTER_SITES=	https://github.com/tagattie/FreeBSD-Electron/releases/download/v7.1.5/:chromium \
 		https://commondatastorage.googleapis.com/chromium-browser-official/:chromium_official \
 		https://commondatastorage.googleapis.com/chromium-nodejs/:chromium_node \
 		https://commondatastorage.googleapis.com/chromium-fonts/:chromium_testfonts
 PKGNAMESUFFIX=	${ELECTRON_VER_MAJOR}
 DISTFILES=	chromium-${CHROMIUM_VER}${EXTRACT_SUFX}:chromium \
 		chromium-${CHROMIUM_OFFICIAL_VER}${EXTRACT_SUFX}:chromium_official \
 		${CHROMIUM_NODE_MODULES_HASH}:chromium_node \
 		${CHROMIUM_TEST_FONTS_HASH}:chromium_testfonts \
 		electron-yarn-cache-${ELECTRON_VER}${EXTRACT_SUFX}:prefetch
 DIST_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	tagattie@yandex.com
+MAINTAINER=	tagattie@FreeBSD.org
 COMMENT=	Build cross-platform desktop apps with JavaScript, HTML, and CSS
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/electron/LICENSE
 
 FETCH_DEPENDS=	yarn:www/yarn-node12
 EXTRACT_DEPENDS=	yarn:www/yarn-node12
 PATCH_DEPENDS=	git:devel/git
 BUILD_DEPENDS=	${LOCALBASE}/bin/ar:devel/binutils \
 		gperf:devel/gperf \
 		yasm:devel/yasm \
 		${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat \
 		node:www/node12 \
 		npm:www/npm-node12
 LIB_DEPENDS=	libatk-bridge-2.0.so:accessibility/at-spi2-atk \
 		libatspi.so:accessibility/at-spi2-core \
 		libsnappy.so:archivers/snappy \
 		libFLAC.so:audio/flac \
 		libopus.so:audio/opus \
 		libdbus-1.so:devel/dbus \
 		libnotify.so:devel/libnotify \
 		libpci.so:devel/libpci \
 		libnspr4.so:devel/nspr \
 		libre2.so:devel/re2 \
 		libdrm.so:graphics/libdrm \
 		libwebp.so:graphics/webp \
 		libavcodec.so:multimedia/ffmpeg \
 		libopenh264.so:multimedia/openh264 \
 		libfreetype.so:print/freetype2 \
 		libharfbuzz.so:print/harfbuzz \
 		libsecret-1.so:security/libsecret \
 		libnss3.so:security/nss \
 		libexpat.so:textproc/expat2 \
 		libfontconfig.so:x11-fonts/fontconfig
 RUN_DEPENDS=	xdg-open:devel/xdg-utils
 TEST_DEPENDS=	git:devel/git \
 		${PYTHON_PKGNAMEPREFIX}python-dbusmock>0:devel/py-python-dbusmock@${PY_FLAVOR} \
 		npm:www/npm-node12
 
 USES=		bison dos2unix gettext-tools gl gnome jpeg localbase:ldflags \
 		ninja pkgconfig python:2.7,build,test tar:xz xorg
 
 USE_GITHUB=	yes
 GH_TAGNAME=	${DISTVERSIONPREFIX}${ELECTRON_VER}
 GH_TUPLE=	nodejs:node:v${NODE_VER}:node \
 		nodejs:nan:${NAN_VER}:nan
 		# boto:boto:f7574aa6cc2c819430c1f05e9a1a1a666ef8169b:boto \
 		# yaml:pyyaml:3.12:pyyaml \
 		# kennethreitz:requests:e4d59bedfd3c7f4f254f4f5d036587bcd8152458:requests
 
 # Official chromium version containing "gn" which is known to work
 CHROMIUM_OFFICIAL_VER=	78.0.3904.108
 # See ${WRKSRC}/electron/DEPS for CHROMIUM_VER
 CHROMIUM_VER=	78.0.3904.130
 # See ${WRKSRC}/third_party/node/node_modules.tar.gz.sha1 for CHROMIUM_NODE_MODULES_HASH
 CHROMIUM_NODE_MODULES_HASH=	ab7f28fee456b5af5fbd3fcb5bcc7c61420788c9
 # See ${WRKSRC}/third_party/test_fonts/test_fonts.tar.gz.sha1 for CHROMIUM_TEST_FONTS_HASH
 CHROMIUM_TEST_FONTS_HASH=	a22de844e32a3f720d219e3911c3da3478039f89
 # See ${WRKSRC}/electron/DEPS for NODE_VER
 NODE_VER=	12.8.1
 # See ${WRKSRC}/electron/DEPS for NAN_VER
 NAN_VER=	2ee313aaca52e2b478965ac50eb5082520380d1b
 
 NO_WRKSUBDIR=	yes
 WRKSRC_SUBDIR=	src
 
 DATADIR=	${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX}
 
 DOS2UNIX_FILES=	third_party/skia/third_party/vulkanmemoryallocator/include/vk_mem_alloc.h
 BINARY_ALIAS=	python=${PYTHON_CMD}
 
 USE_XORG=	x11 xcb xcomposite xcursor xdamage xext xfixes xi xrandr \
 		xrender xscrnsaver xtst
 USE_GL=		gl glesv2
 USE_GNOME=	atk cairo pango gdkpixbuf2 gtk30 libxml2 libxslt
 USE_JAVA=	yes
 JAVA_VERSION=	1.8
 JAVA_BUILD=	yes
 
 USE_LDCONFIG=	${DATADIR}
 
 GN_ARGS+=	clang_use_chrome_plugins=false \
 		enable_hangout_services_extension=true \
 		enable_nacl=false \
 		enable_one_click_signin=true \
 		enable_remoting=false \
 		fieldtrial_testing_like_official_build=true \
 		is_clang=true \
 		toolkit_views=true \
 		treat_warnings_as_errors=false \
 		use_allocator="none" \
 		use_allocator_shim=false \
 		use_aura=true \
 		use_bundled_fontconfig=false \
 		use_custom_libcxx=false \
 		use_gnome_keyring=false \
 		use_jumbo_build=true \
 		use_lld=true \
 		use_sysroot=false \
 		use_system_freetype=true \
 		use_system_harfbuzz=true \
 		use_system_libjpeg=true \
 		extra_cxxflags="${CXXFLAGS}" \
 		extra_ldflags="${LDFLAGS}"
 GN_BOOTSTRAP_FLAGS=	--no-clean --no-rebuild --skip-generate-buildfiles
 
 ALL_TARGET=	electron third_party/electron_node:headers
 MAKE_ARGS=	-C out/${BUILDTYPE}
 MAKE_ENV+=	C_INCLUDE_PATH=${LOCALBASE}/include \
 		CPLUS_INCLUDE_PATH=${LOCALBASE}/include
 
 OPTIONS_DEFINE=	CUPS DEBUG DIST DRIVER KERBEROS
 DIST_DESC=	Build distribution zip files
 DRIVER_DESC=	Install chromedriver
 OPTIONS_GROUP=	AUDIO
 OPTIONS_GROUP_AUDIO=	ALSA PULSEAUDIO
 OPTIONS_DEFAULT=	CUPS DRIVER KERBEROS ALSA
 OPTIONS_SUB=	yes
 
 ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 ALSA_RUN_DEPENDS=	${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-plugins
 ALSA_VARS=	GN_ARGS+=use_alsa=true
 ALSA_VARS_OFF=	GN_ARGS+=use_alsa=false
 
 CUPS_LIB_DEPENDS=	libcups.so:print/cups
 CUPS_VARS=	GN_ARGS+=use_cups=true
 CUPS_VARS_OFF=	GN_ARGS+=use_cups=false
 
 DEBUG_VARS=	BUILDTYPE=Debug \
 		GN_ARGS+=is_component_build=false
 DEBUG_VARS_OFF=	BUILDTYPE=Release
 
 DIST_IMPLIES=	DRIVER
 
 DRIVER_ALL_TARGET=	chromedriver
 
 KERBEROS_VARS=	GN_ARGS+=use_kerberos=true
 KERBEROS_VARS_OFF=	GN_ARGS+=use_kerberos=false
 
 PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 PULSEAUDIO_VARS=	GN_ARGS+=use_pulseaudio=true
 PULSEAUDIO_VARS_OFF=	GN_ARGS+=use_pulseaudio=false
 
 POST_BUILD_TARGETS=	licenses version
 POST_BUILD_DIST_TARGETS=	electron_dist_zip electron_chromedriver_zip electron_mksnapshot_zip
 
 YARN_TIMESTAMP=	1583472449
 
 PLIST_SUB=	ELECTRON_VER=${ELECTRON_VER} \
 		ELECTRON_VER_MAJOR=${ELECTRON_VER_MAJOR}
 
 .include "Makefile.version"
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "amd64"
 PLIST_SUB+=	AMD64=""
 .else
 PLIST_SUB+=	AMD64="@comment "
 .endif
 
 .if ${ARCH} == "i386"
 PLIST_SUB+=	I386=""
 .else
 PLIST_SUB+=	I386="@comment "
 .endif
 
 pre-fetch:
 	@${MKDIR} ${DISTDIR}/${DIST_SUBDIR}
 	if [ ! -f ${DISTDIR}/${DIST_SUBDIR}/electron-yarn-cache-${ELECTRON_VER}${EXTRACT_SUFX} ]; \
 		then ${MKDIR} ${WRKDIR}; \
 		${ECHO_CMD} 'yarn-offline-mirror "./yarn-offline-cache"' >> \
 			${WRKDIR}/.yarnrc; \
 		${CP} ${FILESDIR}/package.json ${FILESDIR}/yarn.lock ${WRKDIR}; \
 		cd ${WRKDIR} && ${SETENV} HOME=${WRKDIR} XDG_CACHE_HOME=${WRKDIR}/.cache \
 			yarn --frozen-lockfile --ignore-scripts; \
 		${MTREE_CMD} -cbnSp yarn-offline-cache | ${MTREE_CMD} -C | ${SED} \
 			-e 's:time=[0-9.]*:time=${YARN_TIMESTAMP}.000000000:' \
 			-e 's:\([gu]id\)=[0-9]*:\1=0:g' \
 			-e 's:flags=.*:flags=none:' \
 			-e 's:^\.:./yarn-offline-cache:' > yarn-offline-cache.mtree; \
 		${TAR} cJf ${DISTDIR}/${DIST_SUBDIR}/electron-yarn-cache-${ELECTRON_VER}${EXTRACT_SUFX} \
 			@yarn-offline-cache.mtree; \
 		${RM} -r ${WRKDIR}; \
 	fi
 
 post-extract:
 	${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/chromium-${CHROMIUM_VER} ${WRKSRC}
 	${RM} -r ${WRKSRC}/tools/gn
 	${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/chromium-${CHROMIUM_OFFICIAL_VER}/tools/gn \
 		${WRKSRC}/tools/gn
 	${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/${PORTNAME}-${ELECTRON_VER} ${WRKSRC}/electron
 	${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/${GH_PROJECT_nan}-${NAN_VER} \
 		${WRKSRC}/third_party/nan
 	${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/${GH_PROJECT_node}-${NODE_VER} \
 		${WRKSRC}/third_party/electron_node
 	${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/yarn-offline-cache ${WRKDIR}
 	${ECHO_CMD} 'yarn-offline-mirror "../../../yarn-offline-cache"' >> ${WRKSRC}/electron/.yarnrc
 	cd ${WRKSRC}/electron && \
 		${SETENV} HOME=${WRKDIR} XDG_CACHE_HOME=${WRKDIR}/.cache yarn --frozen-lockfile --offline
 	# ${RMDIR} ${WRKSRC}/electron/vendor/${GH_PROJECT_boto}
 	# ${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/${GH_PROJECT_boto}-${GH_TAGNAME_boto} \
 	# 	${WRKSRC}/electron/vendor/${GH_PROJECT_boto}
 	# ${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/${GH_PROJECT_pyyaml}-${GH_TAGNAME_pyyaml} \
 	# 	${WRKSRC}/electron/vendor/${GH_PROJECT_pyyaml}
 	# ${RMDIR} ${WRKSRC}/electron/vendor/${GH_PROJECT_requests}
 	# ${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/${GH_PROJECT_requests}-${GH_TAGNAME_requests} \
 	# 	${WRKSRC}/electron/vendor/${GH_PROJECT_requests}
 	${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/node_modules ${WRKSRC}/third_party/node
 	${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/test_fonts ${WRKSRC}/third_party/test_fonts
 
 pre-patch:
 	${SH} ${FILESDIR}/apply-electron-patches.sh ${WRKSRC}
 	# ${FIND} ${WRKSRC} -type f -name '*.orig' -print -delete
 	# ${FIND} ${WRKSRC} -type f -name '*~' -print -delete
 
 pre-configure:
 	# cd ${WRKSRC}/electron/vendor/${GH_PROJECT_boto} && \
 	# 	${PYTHON_CMD} setup.py build
 	# cd ${WRKSRC}/electron/vendor/${GH_PROJECT_requests} && \
 	# 	${PYTHON_CMD} setup.py build
 	# We used to remove bundled libraries to be sure that chromium uses
 	# system libraries and not shipped ones.
 	# cd ${WRKSRC} && ${PYTHON_CMD} \
 	#./build/linux/unbundle/remove_bundled_libraries.py [list of preserved]
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${PYTHON_CMD} \
 		./build/linux/unbundle/replace_gn_files.py --system-libraries \
 		ffmpeg flac freetype harfbuzz-ng libdrm libusb libwebp libxml \
 		libxslt openh264 opus snappy yasm || ${FALSE}
 
 do-configure:
 	# GN generator bootstrapping and generating ninja files
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} CC=${CC} CXX=${CXX} LD=${CXX} \
 		READELF=${READELF} AR=${AR} NM=${NM} ${PYTHON_CMD} \
 		./tools/gn/bootstrap/bootstrap.py ${GN_BOOTSTRAP_FLAGS}
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ./out/${BUILDTYPE}/gn gen out/${BUILDTYPE} \
 		--args='import("//electron/build/args/${BUILDTYPE:tl}.gn") ${GN_ARGS}'
 	# Setup nodejs dependency
 	${MKDIR} ${WRKSRC}/third_party/node/freebsd/node-freebsd-x64/bin
 	${LN} -sf ${LOCALBASE}/bin/node ${WRKSRC}/third_party/node/freebsd/node-freebsd-x64/bin/node
 	# Setup java dependency
 	${MKDIR} ${WRKDIR}/bin
 	${LN} -sf ${LOCALBASE}/openjdk8/bin/java ${WRKDIR}/bin/java
 
 # do-build:
 # 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ninja -C out/${BUILDTYPE} ${ALL_TARGET}
 
 post-build:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
 		${MAKE_CMD} ${MAKE_ARGS} ${POST_BUILD_TARGETS}
 
 post-build-DIST-on:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
 		${MAKE_CMD} ${MAKE_ARGS} ${POST_BUILD_DIST_TARGETS}
 	cd ${WRKSRC}/out/${BUILDTYPE} && \
 		${CP} chromedriver.zip chromedriver-v${ELECTRON_VER}-freebsd-${ARCH:S/amd64/x64/:S/i386/ia32/}.zip && \
 		${CP} dist.zip electron-v${ELECTRON_VER}-freebsd-${ARCH:S/amd64/x64/:S/i386/ia32/}.zip && \
 		${CP} mksnapshot.zip mksnapshot-v${ELECTRON_VER}-freebsd-${ARCH:S/amd64/x64/:S/i386/ia32/}.zip && \
 		${SHA256} -r *-v${ELECTRON_VER}-freebsd-*.zip | ${SED} -e 's/ / */' > SHASUMS256.txt
 
 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}
 .for f in electron mksnapshot v8_context_snapshot_generator
 	${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/${f} ${STAGEDIR}${DATADIR}
 .endfor
 .for f in libEGL.so libGLESv2.so
 	${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/${f} ${STAGEDIR}${DATADIR}
 .endfor
 	${MKDIR} ${STAGEDIR}${DATADIR}/swiftshader
 .for f in libEGL.so libGLESv2.so libvk_swiftshader.so
 	${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/swiftshader/${f} ${STAGEDIR}${DATADIR}/swiftshader
 .endfor
 .for f in LICENSE LICENSES.chromium.html icudtl.dat natives_blob.bin snapshot_blob.bin v8_context_snapshot.bin version
 	${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/${f} ${STAGEDIR}${DATADIR}
 .endfor
 .for f in chrome_100_percent.pak chrome_200_percent.pak resources.pak
 	${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/${f} ${STAGEDIR}${DATADIR}
 .endfor
 	${MKDIR} ${STAGEDIR}${DATADIR}/locales
 	${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/locales/*.pak ${STAGEDIR}${DATADIR}/locales
 	${MKDIR} ${STAGEDIR}${DATADIR}/resources
 .for f in default_app.asar
 	${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/resources/${f} ${STAGEDIR}${DATADIR}/resources
 .endfor
 	cd ${WRKSRC}/out/${BUILDTYPE}/gen && ${COPYTREE_SHARE} node_headers ${STAGEDIR}${DATADIR}
 	${RLN} ${STAGEDIR}${DATADIR}/electron ${STAGEDIR}${PREFIX}/bin/electron${PKGNAMESUFFIX}
 
 post-install-DIST-on:
 	${MKDIR} ${STAGEDIR}${DATADIR}/releases
 	${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/SHASUMS256.txt ${STAGEDIR}${DATADIR}/releases
 	${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/*-v${ELECTRON_VER}-freebsd-*.zip ${STAGEDIR}${DATADIR}/releases
 
 post-install-DRIVER-on:
 	${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/chromedriver ${STAGEDIR}${DATADIR}
 
 do-test:
 	# Note 1: "npm install" will run before actual tests are executed
 	# Note 2: Xvfb or something similar is necessary for headless testing
 	cd ${WRKSRC}/electron && \
 		${SETENV} ${TEST_ENV} ELECTRON_OUT_DIR=${BUILDTYPE} LOCAL_GIT_DIRECTORY=${LOCALBASE} \
 		npm run test -- --ci
 
 .include <bsd.port.post.mk>
diff --git a/devel/libappindicator/Makefile b/devel/libappindicator/Makefile
index 4c53f5ca74d0..0e1ddd73bcef 100644
--- a/devel/libappindicator/Makefile
+++ b/devel/libappindicator/Makefile
@@ -1,51 +1,51 @@
 # $FreeBSD$
 
 PORTNAME=	libappindicator
 PORTVERSION=	${MAJOR_VER}.${SNAPSHOT_VER:S/.//g}.${PATCH_VER:S/ubuntu//}
 CATEGORIES=	devel
 MASTER_SITES=	http://archive.ubuntu.com/ubuntu/pool/main/liba/${PORTNAME}/
 DISTNAME=	${PORTNAME}_${MAJOR_VER}+${SNAPSHOT_VER}.orig
 
 PATCH_SITES=		${MASTER_SITES}
 PATCHFILES=		${PORTNAME}_${MAJOR_VER}+${SNAPSHOT_VER}-${PATCH_VER}.diff.gz
 PATCH_DIST_STRIP=	-p1
 
-MAINTAINER=	tagattie@yandex.com
+MAINTAINER=	tagattie@FreeBSD.org
 COMMENT=	KSNI App Indicator library
 
 LICENSE=	LGPL21+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	gnome-autogen.sh:devel/gnome-common \
 		gtkdocize:textproc/gtk-doc
 LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib \
 		libdbusmenu-gtk3.so:devel/libdbusmenu
 
 USES=		autoreconf:build gmake gnome libtool pkgconfig
 USE_LDCONFIG=	yes
 USE_GNOME=	cairo gdkpixbuf2 gtk30
 
 OPTIONS_DEFINE=		VAPI
 OPTIONS_DEFAULT=	VAPI
 OPTIONS_SUB=		yes
 
 VAPI_BUILD_DEPENDS=	vala>=0:lang/vala
 VAPI_CONFIGURE_ENV_OFF=	ac_cv_path_VALA_API_GEN= \
 			ac_cv_path_VALAC=
 VAPI_VARS=		EXTRA_PATCHES+=${PATCHDIR}/extra-patch-bindings_vala_examples_Makefile.am
 
 NO_WRKSUBDIR=	yes
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-gtk-doc \
 		--with-gtk=3
 INSTALL_TARGET=	install-strip
 
 MAJOR_VER=	12.10.1
 SNAPSHOT_VER=	18.04.20180322.1
 PATCH_VER=	0ubuntu5
 
 pre-configure:
 	cd ${WRKSRC} && ${SETENV} NOCONFIGURE=yes ${SH} ./autogen.sh
 
 .include <bsd.port.mk>
diff --git a/devel/py-ewmh/Makefile b/devel/py-ewmh/Makefile
index 79b8d1597236..3853000319cb 100644
--- a/devel/py-ewmh/Makefile
+++ b/devel/py-ewmh/Makefile
@@ -1,22 +1,22 @@
 # $FreeBSD$
 
 PORTNAME=	ewmh
 DISTVERSION=	0.1.6
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	tagattie@yandex.com
+MAINTAINER=	tagattie@FreeBSD.org
 COMMENT=	Python implementation of Extended Window Manager Hints, based on Xlib
 
 LICENSE=	LGPL3+
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}xlib>0:x11-toolkits/py-xlib@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist distutils
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-python-dbusmock/Makefile b/devel/py-python-dbusmock/Makefile
index 226f0beb71e6..a58c00b192b9 100644
--- a/devel/py-python-dbusmock/Makefile
+++ b/devel/py-python-dbusmock/Makefile
@@ -1,23 +1,23 @@
 # $FreeBSD$
 
 PORTNAME=	python-dbusmock
 PORTVERSION=	0.18.3
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	tagattie@yandex.com
+MAINTAINER=	tagattie@FreeBSD.org
 COMMENT=	Mock D-Bus objects for tests
 
 LICENSE=	LGPL3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dbus>0:devel/py-dbus@${PY_FLAVOR}
 
 USES=		gnome python
 USE_GNOME=	pygobject3
 USE_PYTHON=	autoplist distutils
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/editors/atom/Makefile b/editors/atom/Makefile
index 822a8f75269d..148a12057124 100644
--- a/editors/atom/Makefile
+++ b/editors/atom/Makefile
@@ -1,252 +1,252 @@
 # $FreeBSD$
 
 PORTNAME=	atom
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.45.0
 CATEGORIES=	editors
 MASTER_SITES=	https://nodejs.org/dist/v${APM_NODE_VER}/:node \
 		https://github.com/tagattie/FreeBSD-Atom/releases/download/v1.42.0/:jasmine_tagged \
 		https://github.com/tagattie/FreeBSD-Atom/releases/download/${DISTVERSIONFULL}/:npm_cache
 PKGNAMESUFFIX=	-ide
 DISTFILES=	node-v${APM_NODE_VER}${EXTRACT_SUFX}:node \
 		jasmine-tagged-1.1.4.tar.gz:jasmine_tagged \
 		atom-npm-cache-${DISTVERSION}${EXTRACT_SUFX}:npm_cache \
 		atom-apm-cache-${DISTVERSION}${EXTRACT_SUFX}:npm_cache
 
-MAINTAINER=	tagattie@yandex.com
+MAINTAINER=	tagattie@FreeBSD.org
 COMMENT=	Hackable text editor for the 21st century
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 ONLY_FOR_ARCHS=	amd64
 
 BUILD_DEPENDS=	zip:archivers/zip \
 		electron${ELECTRON_VER_MAJOR}:devel/electron${ELECTRON_VER_MAJOR} \
 		bash:shells/bash \
 		rg:textproc/ripgrep \
 		node:www/node10 \
 		npm:www/npm-node10
 LIB_DEPENDS=	libatk-bridge-2.0.so:accessibility/at-spi2-atk \
 		libsnappy.so:archivers/snappy \
 		libasound.so:audio/alsa-lib \
 		libFLAC.so:audio/flac \
 		libopus.so:audio/opus \
 		libdbus-1.so:devel/dbus \
 		libinotify.so:devel/libinotify \
 		libnotify.so:devel/libnotify \
 		libpci.so:devel/libpci \
 		libnspr4.so:devel/nspr \
 		libpcre2-8.so:devel/pcre2 \
 		libdrm.so:graphics/libdrm \
 		libwebp.so:graphics/webp \
 		libavcodec.so:multimedia/ffmpeg \
 		libopenh264.so:multimedia/openh264 \
 		libcups.so:print/cups \
 		libfreetype.so:print/freetype2 \
 		libharfbuzz.so:print/harfbuzz \
 		libsecret-1.so:security/libsecret \
 		libnss3.so:security/nss \
 		libexpat.so:textproc/expat2 \
 		libfontconfig.so:x11-fonts/fontconfig
 RUN_DEPENDS=	git:devel/git \
 		xdg-open:devel/xdg-utils \
 		bash:shells/bash
 TEST_DEPENDS=	bash:shells/bash
 
 USES=		desktop-file-utils gl gnome jpeg localbase:ldflags pkgconfig \
 		python:2.7 shebangfix xorg
 
 USE_GITHUB=	yes
 
 .include "${.CURDIR}/../../devel/electron4/Makefile.version"
 # See ${WRKSRC}/apm/node_modules/atom-package-manager/BUNDLED_NODE_VERSION for APM_NODE_VER
 APM_NODE_VER=	10.2.1
 
 BINARY_ALIAS=	python=${PYTHON_CMD}
 
 USE_XORG=	x11 xcb xcomposite xcursor xdamage xext xfixes xi xkbfile \
 		xrandr xrender xscrnsaver xtst
 USE_GL=		gl glesv2
 USE_GNOME=	atk cairo pango gtk30 libxml2 libxslt
 INSTALLS_ICONS=	yes
 
 USE_LDCONFIG=	${DATADIR}
 
 SHEBANG_FILES=	atom.sh
 SHEBANG_FILES_APM=	apm/node_modules/atom-package-manager/bin/apm \
 		apm/node_modules/atom-package-manager/bin/npm \
 		apm/node_modules/atom-package-manager/bin/python-interceptor.sh \
 		apm/node_modules/atom-package-manager/script/postinstall.sh \
 		apm/node_modules/atom-package-manager/node_modules/npm/configure \
 		apm/node_modules/atom-package-manager/node_modules/npm/lib/utils/completion.sh \
 		apm/node_modules/atom-package-manager/node_modules/npm/node_modules/node-gyp/gyp/gyp \
 		apm/node_modules/atom-package-manager/node_modules/npm/node_modules/node-gyp/gyp/samples/samples \
 		apm/node_modules/atom-package-manager/node_modules/npm/scripts/clean-old.sh \
 		apm/node_modules/atom-package-manager/node_modules/npm/scripts/dep-update \
 		apm/node_modules/atom-package-manager/node_modules/npm/scripts/dev-dep-update \
 		apm/node_modules/atom-package-manager/node_modules/npm/scripts/relocate.sh \
 
 pre-everything::
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "The limit imposed by poudriere(8) for the maximum number of files allowed to be"
 	@${ECHO_MSG} "opened by a jail (default 1024) is exceeded during the build of ${PORTNAME}."
 	@${ECHO_MSG} "To successfully build ${PORTNAME} with poudriere(8), you must add the following"
 	@${ECHO_MSG} "line to poudriere.conf:"
 	@${ECHO_MSG} "MAX_FILES_${PORTNAME}${PKGNAMESUFFIX:C/-/_/}=4096"
 	@${ECHO_MSG} ""
 
 post-extract:
 	# copy linux keymaps and menus files
 	cd ${WRKSRC}/keymaps && ${CP} linux.cson freebsd.cson
 	cd ${WRKSRC}/menus && ${CP} linux.cson freebsd.cson
 
 post-patch:
 	${REINPLACE_CMD} -E 's|("electronVersion":.*").*(")|\1${ELECTRON_VER}\2|' \
 		${WRKSRC}/package.json
 	${REINPLACE_CMD} -e 's|/usr/share|${PREFIX}/share|g' \
 		${WRKSRC}/script/lib/install-application.js
 	${REINPLACE_CMD} -e 's|<%= installDir %>|${PREFIX}|' \
 		${WRKSRC}/resources/linux/atom.desktop.in
 
 pre-build: build-apm-node bootstrap-script bootstrap-apm bootstrap-atom clean-backup
 build-apm-node:
 	cd ${WRKDIR}/node-v${APM_NODE_VER} && \
 		${SETENV} ${CONFIGURE_ENV} CC=${CC} CXX=${CXX} ./configure && \
 		${SETENV} ${MAKE_ENV} ${BSDMAKE} -j ${MAKE_JOBS_NUMBER}
 bootstrap-script:
 	cd ${WRKSRC}/script && ${SETENV} ${MAKE_ENV} \
 		npm install --ignore-scripts --offline
 	for p in ${PATCHDIR}/script/patch-*; do \
 		${PATCH} -p0 -d ${WRKSRC} < $${p}; \
 	done
 	cd ${WRKSRC}/script && ${SETENV} ${MAKE_ENV} \
 		npm_config_build_from_source=true \
 		npm_config_offline=true \
 		npm rebuild --nodedir=${LOCALBASE}
 bootstrap-apm:
 	cd ${WRKSRC}/apm && ${SETENV} ${MAKE_ENV} \
 		npm install --global-style --ignore-scripts --offline
 	for p in ${PATCHDIR}/apm/patch-*; do \
 		${PATCH} -p0 -d ${WRKSRC} < $${p}; \
 	done
 	cd ${WRKSRC} && ${FIND} ${SHEBANG_FILES_APM} -type f \
 		-exec ${SED} -i '' -e 's|#!/bin/bash|#!${LOCALBASE}/bin/bash|' \
 				-e 's|#!/usr/bin/python|#!${PYTHON_CMD}|' \
 				-e 's|exec python|exec ${PYTHON_VERSION}|' {} ';'
 	cd ${WRKSRC}/apm/node_modules/atom-package-manager/node_modules/npm/node_modules/node-gyp && \
 		${FIND} . -type f -name '*.py' -exec ${SED} -i '' \
 				-e 's|#!/usr/bin/env python|#!${PYTHON_CMD}|' {} ';'
 	${CP} ${WRKDIR}/node-v${APM_NODE_VER}/out/Release/node \
 		${WRKSRC}/apm/node_modules/atom-package-manager/bin && \
 		${STRIP_CMD} ${WRKSRC}/apm/node_modules/atom-package-manager/bin/node
 	cd ${WRKSRC}/apm/node_modules/atom-package-manager && \
 		${SETENV} ${MAKE_ENV} \
 		npm_config_build_from_source=true \
 		npm_config_offline=true \
 		npm_config_target=${APM_NODE_VER} \
 		npm rebuild --nodedir=${WRKDIR}/node-v${APM_NODE_VER} && \
 		${SETENV} ${MAKE_ENV} \
 		npm_config_build_from_source=true \
 		npm_config_offline=true \
 		npm_config_target=${APM_NODE_VER} \
 		npm dedupe --nodedir=${WRKDIR}/node-v${APM_NODE_VER}
 bootstrap-atom:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
 		ATOM_RESOURCE_PATH=${WRKSRC} \
 		npm_config_target=${ELECTRON_VER} \
 		npm_config_ignore_scripts=true \
 		npm_config_offline=true \
 		./apm/node_modules/atom-package-manager/bin/apm install
 	for p in ${PATCHDIR}/atom/patch-*; do \
 		${PATCH} -p0 -d ${WRKSRC} < $${p}; \
 	done
 	${MKDIR} ${WRKSRC}/node_modules/vscode-ripgrep/bin
 	${CP} ${LOCALBASE}/bin/rg ${WRKSRC}/node_modules/vscode-ripgrep/bin
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
 		ATOM_RESOURCE_PATH=${WRKSRC} \
 		npm_config_target=${ELECTRON_VER} \
 		npm_config_build_from_source=true \
 		npm_config_nodedir=${LOCALBASE}/share/electron${ELECTRON_VER_MAJOR}/node_headers \
 		npm_config_offline=true \
 		./apm/node_modules/atom-package-manager/bin/apm rebuild
 clean-backup:
 	cd ${WRKSRC} && ${FIND} . \( -name '*.bak' -o -name '*.orig' -o -name '*~' \) -print -delete
 
 do-build:
 	# setup download cache for electron-packager
 	${MKDIR} ${WRKSRC}/electron
 	cd ${LOCALBASE}/share/electron${ELECTRON_VER_MAJOR} && \
 		zip -q -r ${WRKSRC}/electron/electron-v${ELECTRON_VER}-freebsd-x64.zip .
 	cd ${WRKSRC}/electron && \
 		${SHA256} -r *-v${ELECTRON_VER}-freebsd-*.zip | \
 		${SED} -e 's/ / */' > SHASUMS256.txt-${ELECTRON_VER}
 	# build atom
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
 		npm_config_target=${ELECTRON_VER} \
 		npm_config_build_from_source=true \
 		npm_config_nodedir=${LOCALBASE}/share/electron${ELECTRON_VER_MAJOR}/node_headers \
 		npm_config_offline=true \
 		./script/build --no-bootstrap
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} XDG_DATA_DIRS=${STAGEDIR}${PREFIX}/share \
 		npm_config_build_from_source=true \
 		npm_config_offline=true \
 		./script/build --no-bootstrap --existing-binaries --install=${STAGEDIR}${PREFIX}
 .for f in chromedriver mksnapshot v8_context_snapshot_generator
 	${RM} ${STAGEDIR}${DATADIR}/${f}
 .endfor
 	${RM} -r ${STAGEDIR}${DATADIR}/node_headers
 	cd ${STAGEDIR}${DATADIR}/resources/app/apm && \
 		${FIND} . -type f -name '*.node' -exec ${STRIP_CMD} {} ';'
 	cd ${STAGEDIR}${DATADIR}/resources/app.asar.unpacked && \
 		${FIND} . -type f -name '*.node' -exec ${STRIP_CMD} {} ';'
 
 do-test:
 	# Note: Xvfb or something similar is necessary for headless testing
 	# core main process tests
 	cd ${WRKSRC} && ${SETENV} ${TEST_ENV} ./script/test
 	# bundled package tests
 	cd ${WRKSRC} && ${SETENV} ${TEST_ENV} ./script/test --package
 
 # Helper targets for port maintainers
 make-npm-cache:
 	# do "make patch" before executing this target
 	cd ${WRKDIR} && ${RM} -r .npm
 	cd ${WRKSRC}/script && \
 		${SETENV} HOME=${WRKDIR} npm install --ignore-scripts
 	cd ${WRKSRC}/apm && \
 		${SETENV} HOME=${WRKDIR} npm install --ignore-scripts
 	cd ${WRKDIR}/.npm && \
 		${RM} -r _locks anonymous-cli-metrics.json
 	cd ${WRKDIR} && \
 		${TAR} -czf atom-npm-cache-${DISTVERSION}${EXTRACT_SUFX} .npm
 
 make-apm-cache:
 	# do up to "make bootstrap-apm" before executing this target
 	cd ${WRKDIR} && ${RM} -r .atom
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
 		ATOM_RESOURCE_PATH=${WRKSRC} \
 		npm_config_target=${ELECTRON_VER} \
 		npm_config_ignore_scripts=true \
 		${WRKSRC}/apm/node_modules/atom-package-manager/bin/apm install
 	cd ${WRKSRC}/node_modules && \
 		for p in `${AWK} '/packageDependencies.*{/,/}/' ${WRKSRC}/package.json | \
 			${SED} -e '1d; $$d' | ${AWK} -F ': ' '{print $$1}' | ${SED} -e 's/"//g'`; do \
 			${ECHO_CMD} "Installing modules for $${p}"; \
 			cd ${WRKSRC}/node_modules/$${p} && ${SETENV} ${MAKE_ENV} \
 				ATOM_RESOURCE_PATH=${WRKSRC} \
 				npm_config_target=${ELECTRON_VER} \
 				npm_config_ignore_scripts=true \
 				${WRKSRC}/apm/node_modules/atom-package-manager/bin/apm install; \
 		done
 	cd ${WRKDIR}/.atom && \
 		${RM} -r .node-gyp packages
 	cd ${WRKDIR}/.atom/.apm && \
 		${RM} -r .apmrc _locks anonymous-cli-metrics.json index-v5
 	cd ${WRKDIR} && \
 		${TAR} -czf atom-apm-cache-${DISTVERSION}${EXTRACT_SUFX} .atom
 
 .include <bsd.port.mk>
diff --git a/editors/vscode/Makefile b/editors/vscode/Makefile
index 0a1b00d77369..1544fb4bea99 100644
--- a/editors/vscode/Makefile
+++ b/editors/vscode/Makefile
@@ -1,236 +1,236 @@
 # $FreeBSD$
 
 PORTNAME=	vscode
 DISTVERSION=	1.43.2
 CATEGORIES=	editors
 MASTER_SITES=	https://nodejs.org/dist/v${NODE_VER}/:node_headers \
 		https://github.com/tagattie/FreeBSD-VSCode/releases/download/${DISTVERSION}/:yarn_cache
 DISTFILES=	node-v${NODE_VER}-headers${EXTRACT_SUFX}:node_headers \
 		yarn-offline-cache-${DISTVERSION}${EXTRACT_SUFX}:yarn_cache \
 		vscode-marketplace-exts-${DISTVERSION}${EXTRACT_SUFX}:yarn_cache
 DIST_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	tagattie@yandex.com
+MAINTAINER=	tagattie@FreeBSD.org
 COMMENT=	Visual Studio Code - Open Source ("Code - OSS")
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 ONLY_FOR_ARCHS=	amd64
 
 BUILD_DEPENDS=	zip:archivers/zip \
 		electron${ELECTRON_VER_MAJOR}:devel/electron${ELECTRON_VER_MAJOR} \
 		rg:textproc/ripgrep \
 		npm:www/npm-node10 \
 		yarn:www/yarn-node10
 LIB_DEPENDS=	libatk-bridge-2.0.so:accessibility/at-spi2-atk \
 		libatspi.so:accessibility/at-spi2-core \
 		libsnappy.so:archivers/snappy \
 		libasound.so:audio/alsa-lib \
 		libFLAC.so:audio/flac \
 		libopus.so:audio/opus \
 		libdbus-1.so:devel/dbus \
 		libinotify.so:devel/libinotify \
 		libnotify.so:devel/libnotify \
 		libpci.so:devel/libpci \
 		libnspr4.so:devel/nspr \
 		libpcre2-8.so:devel/pcre2 \
 		libre2.so:devel/re2 \
 		liblcms2.so:graphics/lcms2 \
 		libdrm.so:graphics/libdrm \
 		libwebp.so:graphics/webp \
 		libavcodec.so:multimedia/ffmpeg \
 		libvpx.so:multimedia/libvpx \
 		libopenh264.so:multimedia/openh264 \
 		libcups.so:print/cups \
 		libfreetype.so:print/freetype2 \
 		libharfbuzz.so:print/harfbuzz \
 		libsecret-1.so:security/libsecret \
 		libnss3.so:security/nss \
 		libexpat.so:textproc/expat2 \
 		libfontconfig.so:x11-fonts/fontconfig
 RUN_DEPENDS=	${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-plugins \
 		xdg-open:devel/xdg-utils \
 		bash:shells/bash
 TEST_DEPENDS=	electron${ELECTRON_VER_MAJOR}:devel/electron${ELECTRON_VER_MAJOR} \
 		bash:shells/bash
 
 USES=		desktop-file-utils gl gmake gnome jpeg pkgconfig \
 		python:2.7,build shebangfix xorg
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	microsoft
 
 SOURCE_COMMIT_HASH=	fe22a9645b44368865c0ba92e2fb881ff1afce94
 
 BINARY_ALIAS=	python=${PYTHON_CMD}
 
 USE_XORG=	x11 xcb xcomposite xcursor xdamage xext xfixes xi xkbfile \
 		xrandr xrender xscrnsaver xtst
 USE_GL=		gl glesv2
 USE_GNOME=	atk cairo pango gdkpixbuf2 gtk30 libxml2 libxslt
 
 USE_LDCONFIG=	${DATADIR}
 
 # See ${WRKSRC}/remote/.yarnrc for NODE_VER
 NODE_VER=	12.4.0
 
 SHEBANG_REGEX=	./(extensions|resources|scripts|src)/.*\.sh$$
 PATHFIX_FILES=	src/vs/workbench/contrib/debug/node/terminals.ts
 
 DATADIR=	${PREFIX}/share/code-oss
 TMPDIR=		${WRKDIR}
 
 MAKE_ENV+=	BUILD_SOURCEVERSION=${SOURCE_COMMIT_HASH} \
 		ELECTRON_SKIP_BINARY_DOWNLOAD=1 \
 		PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=1 \
 		XDG_CACHE_HOME=${WRKDIR}/.cache
 
 ELECTRON_DIR=	${.CURDIR}/../../devel/electron7
 .include	"${ELECTRON_DIR}/Makefile.version"
 
 pre-everything::
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "The limit imposed by poudriere(8) for the maximum number of files allowed to be"
 	@${ECHO_MSG} "opened by a jail (default 1024) is exceeded during the build of ${PORTNAME}."
 	@${ECHO_MSG} "To successfully build ${PORTNAME} with poudriere(8), you must add the following"
 	@${ECHO_MSG} "line to poudriere.conf:"
 	@${ECHO_MSG} "MAX_FILES_${PORTNAME}=4096"
 	@${ECHO_MSG} ""
 
 post-patch:
 	# force use of electron version matching port one
 	${REINPLACE_CMD} -E 's|^(target ").*(")$$|\1${ELECTRON_VER}\2|' \
 		${WRKSRC}/.yarnrc
 	# setup yarnrc for using local node headers
 	${ECHO_CMD} 'nodedir "${LOCALBASE}/share/electron${ELECTRON_VER_MAJOR}/node_headers"' >> \
 		${WRKSRC}/.yarnrc
 	${ECHO_CMD} 'nodedir "${WRKDIR}/node-v${NODE_VER}"' >> \
 		${WRKSRC}/remote/.yarnrc
 	# setup yarnrc for offline node_modules installation
 	${ECHO_CMD} 'yarn-offline-mirror "../yarn-offline-cache"' >> \
 		${WRKSRC}/.yarnrc
 	(cd ${WRKSRC} && \
 		${FIND} -E . -type f -iregex '${SHEBANG_REGEX}' \
 			-exec ${SED} -i '' -e "s|/usr/bin/pgrep|/bin/pgrep|g" {} ';')
 	(cd ${WRKSRC} && \
 		${FIND} ${PATHFIX_FILES} -type f \
 			-exec ${SED} -i '' -e "s|/usr/bin/pgrep|/bin/pgrep|g" {} ';')
 	${REINPLACE_CMD} -e 's/@@NAME_LONG@@/Code - OSS/; \
 			s/@@NAME_SHORT@@/Code - OSS/; \
 			s/@@PRODNAME@@/Code - OSS/; \
 			s/@@NAME@@/code-oss/g; \
 			s|@@EXEC@@|${PREFIX}/bin/code-oss|; \
 			s/@@ICON@@/com.visualstudio.code.oss/; \
 			s/@@URLPROTOCOL@@/code-oss/; \
 			s/@@LICENSE@@/MIT/; \
 			s/@@APPNAME@@/code-oss/g; \
 			s|/usr/share|${PREFIX}/share|' \
 		${WRKSRC}/resources/completions/bash/code \
 		${WRKSRC}/resources/completions/zsh/_code \
 		${WRKSRC}/resources/linux/bin/code.sh \
 		${WRKSRC}/resources/linux/code.appdata.xml \
 		${WRKSRC}/resources/linux/code.desktop \
 		${WRKSRC}/resources/linux/code-url-handler.desktop
 	(cd ${WRKDIR}/builtInExtensions && \
 		${FIND} . -type f -name '*.sh' \
 			-exec ${SED} -i '' -e "s|/usr/bin/pgrep|/bin/pgrep|g" \
 					-e 's|#!/bin/bash|#!${LOCALBASE}/bin/bash|' {} ';')
 
 pre-build:
 	# # install node_modules without executing post-installation scripts
 	# cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
 	# 	yarn --frozen-lockfile --ignore-scripts --offline
 	# # copy rg binary files to vscode-ripgrep module directory
 	# ${MKDIR} ${WRKSRC}/node_modules/vscode-ripgrep/bin
 	# ${CP} ${LOCALBASE}/bin/rg ${WRKSRC}/node_modules/vscode-ripgrep/bin
 	# ${MKDIR} ${WRKSRC}/remote/node_modules/vscode-ripgrep/bin
 	# ${CP} ${LOCALBASE}/bin/rg ${WRKSRC}/remote/node_modules/vscode-ripgrep/bin
 	# install node_modules
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
 		yarn --frozen-lockfile --offline
 	# copy rg binary files to vscode-ripgrep module directory
 	${MKDIR} ${WRKSRC}/node_modules/vscode-ripgrep/bin
 	${CP} ${LOCALBASE}/bin/rg ${WRKSRC}/node_modules/vscode-ripgrep/bin
 	${MKDIR} ${WRKSRC}/remote/node_modules/vscode-ripgrep/bin
 	${CP} ${LOCALBASE}/bin/rg ${WRKSRC}/remote/node_modules/vscode-ripgrep/bin
 
 do-build:
 	# setup download cache for gulp-atom-electron
 	${MKDIR} ${WRKDIR}/gulp-electron-cache/atom/electron
 	cd ${LOCALBASE}/share/electron${ELECTRON_VER_MAJOR} && \
 		zip -q -r ${WRKDIR}/gulp-electron-cache/atom/electron/electron-v${ELECTRON_VER}-linux-x64.zip .
 	cd ${WRKDIR}/gulp-electron-cache/atom/electron && \
 		${SHA256} -r *-v${ELECTRON_VER}-linux-*.zip | \
 		${SED} -e 's/ / */' > SHASUMS256.txt-${ELECTRON_VER}
 	# build and package vscode
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} yarn gulp vscode-linux-x64-min
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} yarn gulp vscode-reh-linux-x64-min
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} yarn gulp vscode-reh-web-linux-x64-min
 	# copy marketplace extensions
 	${MV} ${WRKDIR}/builtInExtensions/* ${WRKDIR}/VSCode-linux-x64/resources/app/extensions
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d
 	${INSTALL_DATA} ${WRKSRC}/resources/completions/bash/code \
 		${STAGEDIR}${PREFIX}/etc/bash_completion.d/code-oss
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions
 	${INSTALL_DATA} ${WRKSRC}/resources/completions/zsh/_code \
 		${STAGEDIR}${PREFIX}/share/zsh/site-functions/_code-oss
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/appdata
 	${INSTALL_DATA} ${WRKSRC}/resources/linux/code.appdata.xml \
 		${STAGEDIR}${PREFIX}/share/appdata/code-oss.appdata.xml
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/applications
 .for f in code.desktop code-url-handler.desktop
 	${INSTALL_DATA} ${WRKSRC}/resources/linux/${f} \
 		${STAGEDIR}${PREFIX}/share/applications/${f:S/code/code-oss/}
 .endfor
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/pixmaps
 	${INSTALL_DATA} ${WRKSRC}/resources/linux/code.png \
 		${STAGEDIR}${PREFIX}/share/pixmaps/com.visualstudio.code.oss.png
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	cd ${WRKDIR}/VSCode-linux-x64 && \
 		${TAR} -cf - . | ${TAR} -xf - -C ${STAGEDIR}${DATADIR}
 	cd ${STAGEDIR}${DATADIR}/resources/app/node_modules.asar.unpacked && \
 		${FIND} . -type f -exec ${STRIP_CMD} {} ';'
 .for f in chromedriver mksnapshot v8_context_snapshot_generator
 	${RM} ${STAGEDIR}${DATADIR}/${f}
 .endfor
 	${RM} -r ${STAGEDIR}${DATADIR}/node_headers
 	${RM} -r ${STAGEDIR}${DATADIR}/resources/completions
 	${RLN} ${STAGEDIR}${DATADIR}/bin/code-oss ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_SCRIPT} ${FILESDIR}/wrapper.sh ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 
 pre-test:
 	# setup electron dependency for unit tests
 	${MKDIR} ${WRKSRC}/.build/electron
 	cd ${LOCALBASE}/share/electron${ELECTRON_VER_MAJOR} && \
 		${TAR} -cf - . | ${TAR} -xf - -C ${WRKSRC}/.build/electron
 	cd ${WRKSRC}/.build/electron && ${MV} -f electron code-oss
 
 do-test:
 	# Note: Xvfb or something similar is necessary for headless testing
 	# unit tests
 	cd ${WRKSRC} && ${SETENV} ${TEST_ENV} ./scripts/test.sh || ${TRUE}
 	# UI smoke tests
 	cd ${WRKSRC} && ${SETENV} ${TEST_ENV} yarn smoketest
 
 ### targets for port maintainer(s)
 make-yarn-cache:
 	# do "make configure" before executing this target
 	${RM} -r ${WRKDIR}/yarn-offline-cache
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
 		yarn --frozen-lockfile --ignore-scripts
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
 		yarn postinstall --frozen-lockfile
 	cd ${WRKDIR} && ${TAR} -czf \
 		yarn-offline-cache-${DISTVERSION}${EXTRACT_SUFX} yarn-offline-cache
 
 make-marketplace-exts:
 	${RM} -r ${WRKSRC}/.build/builtInExtensions
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
 		yarn download-builtin-extensions && \
 	cd ${WRKSRC}/.build && ${TAR} -czf \
 		${WRKDIR}/vscode-marketplace-exts-${DISTVERSION}${EXTRACT_SUFX} builtInExtensions
 
 .include <bsd.port.mk>
diff --git a/graphics/gifsicle/Makefile b/graphics/gifsicle/Makefile
index 8d6ee5c67bd8..f8a8faaf43a6 100644
--- a/graphics/gifsicle/Makefile
+++ b/graphics/gifsicle/Makefile
@@ -1,37 +1,37 @@
 # Created by: Brad Hendrickse <bradh@iafrica.com>
 # $FreeBSD$
 
 PORTNAME=	gifsicle
 PORTVERSION=	1.92
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.lcdf.org/gifsicle/
 
-MAINTAINER=	tagattie@yandex.com
+MAINTAINER=	tagattie@FreeBSD.org
 COMMENT=	Manipulates GIF images and animations
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BROKEN_mips=		fails to build: undefined reference to '__sync_add_and_fetch_4'
 BROKEN_mips64=		fails to build: undefined reference to '__sync_add_and_fetch_4'
 
 GNU_CONFIGURE=	yes
 
 PORTDOCS=	NEWS.md README.md
 PLIST_FILES=	bin/gifdiff bin/gifsicle \
 		man/man1/gifdiff.1.gz man/man1/gifsicle.1.gz
 
 OPTIONS_DEFINE=		DOCS X11
 OPTIONS_DEFAULT=
 
 X11_USES=		xorg
 X11_USE=		xorg=x11
 X11_CONFIGURE_ENABLE=	gifview
 X11_CONFIGURE_WITH=	x
 X11_PLIST_FILES=	bin/gifview man/man1/gifview.1.gz
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
diff --git a/x11-themes/materia-gtk-theme/Makefile b/x11-themes/materia-gtk-theme/Makefile
index a97e8d94a22b..c53354ad0a1a 100644
--- a/x11-themes/materia-gtk-theme/Makefile
+++ b/x11-themes/materia-gtk-theme/Makefile
@@ -1,59 +1,59 @@
 # $FreeBSD$
 
 PORTNAME=	materia-gtk-theme
 DISTVERSIONPREFIX=	v
 DISTVERSION=	20200320
 CATEGORIES=	x11-themes
 
-MAINTAINER=	tagattie@yandex.com
+MAINTAINER=	tagattie@FreeBSD.org
 COMMENT=	Material Design theme for GNOME/GTK+ based desktop environments
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	bash:shells/bash
 RUN_DEPENDS=	gtk-murrine-engine>0:x11-themes/gtk-murrine-engine \
 		gnome-themes-extra>0:x11-themes/gnome-themes-extra
 
 USES=		shebangfix
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	nana-4
 GH_PROJECT=	materia-theme
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 PORTDOCS=	COPYING README.md
 SHEBANG_FILES=	install.sh
 
 OPTIONS_DEFINE=	DOCS GNOMESHELL
 OPTIONS_DEFAULT=	GNOMESHELL
 OPTIONS_SUB=	yes
 
 # the install script needs gnome-shell to determine its
 # version, but not all gtk themes users are Gnome users,
 # and keeping gnome-shell as standard build time dependency
 # would force non-Gnome users to build 110+ gnome ports just
 # to get the theme.
 GNOMESHELL_DESC=		Add Gnome-Shell theme version
 GNOMESHELL_BUILD_DEPENDS=	gnome-shell:x11/gnome-shell
 GNOMESHELL_PORTDOCS=		gnome-shell.README.md
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/themes
 	${WRKSRC}/install.sh --dest ${STAGEDIR}${PREFIX}/share/themes
 	@${MV} ${WRKSRC}/src/gnome-shell/README.md \
 		${WRKSRC}/gnome-shell.README.md
 	@${RM} ${STAGEDIR}${PREFIX}/share/themes/*/COPYING
 	@${RM} ${STAGEDIR}${PREFIX}/share/themes/*/gnome-shell/README.md
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC} && \
 		${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR})
 
 post-install-GNOMESHELL-off:
 	@${RM} -R ${STAGEDIR}${PREFIX}/share/themes/*/gnome-shell
 
 .include <bsd.port.mk>
diff --git a/x11-themes/papirus-icon-theme/Makefile b/x11-themes/papirus-icon-theme/Makefile
index d763e118750a..460ea838cfba 100644
--- a/x11-themes/papirus-icon-theme/Makefile
+++ b/x11-themes/papirus-icon-theme/Makefile
@@ -1,34 +1,34 @@
 # $FreeBSD$
 
 PORTNAME=	papirus-icon-theme
 PORTVERSION=	20200301
 CATEGORIES=	x11-themes
 
-MAINTAINER=	tagattie@yandex.com
+MAINTAINER=	tagattie@FreeBSD.org
 COMMENT=	Papirus icon theme
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		gmake gnome
 INSTALLS_ICONS=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	PapirusDevelopmentTeam
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 PORTDOCS=	AUTHORS README.md
 
 OPTIONS_DEFINE=	DOCS
 
 post-install:
 	cd ${STAGEDIR}${PREFIX} && \
 		${FIND} share/icons -type f -o -type l >> ${TMPPLIST}
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_MAN} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/x11-themes/plata-theme/Makefile b/x11-themes/plata-theme/Makefile
index e4acd3ec6dd1..a96ef565ef8d 100644
--- a/x11-themes/plata-theme/Makefile
+++ b/x11-themes/plata-theme/Makefile
@@ -1,85 +1,85 @@
 # $FreeBSD$
 
 PORTNAME=	plata-theme
 PORTVERSION=	0.9.6
 CATEGORIES=	x11-themes
 
-MAINTAINER=	tagattie@yandex.com
+MAINTAINER=	tagattie@FreeBSD.org
 COMMENT=	Gtk theme based on Material Design Refresh
 
 LICENSE=	GPLv2 CC-BY-SA-4.0
 LICENSE_COMB=	multi
 LICENSE_FILE_GPLv2=	${WRKSRC}/COPYING
 LICENSE_FILE_CC-BY-SA-4.0=	${WRKSRC}/LICENSE_CC_BY_SA4
 
 BUILD_DEPENDS=	inkscape:graphics/inkscape \
 		sassc:textproc/sassc \
 		bash:shells/bash
 RUN_DEPENDS=	gtk-murrine-engine>0:x11-themes/gtk-murrine-engine \
 		roboto-fonts-ttf>0:x11-fonts/roboto-fonts-ttf
 
 USES=		autoreconf gmake gnome pkgconfig shebangfix
 USE_GNOME=	gdkpixbuf2 gtk30 libxml2
 
 USE_GITLAB=	yes
 GL_SITE=	https://gitlab.com
 GL_ACCOUNT=	tista500
 GL_COMMIT=	1c0cf5812c21dc0922498b67812f14824c312b35
 
 NO_ARCH=	yes
 
 SHEBANG_REGEX=	./src/.*\.sh$$
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-gtk_next \
 		--disable-flashback \
 		--disable-telegram \
 		--disable-tweetdeck \
 		--disable-airforsteam
 
 PORTDOCS=	README.md README.window-list
 
 OPTIONS_DEFINE=	CINNAMON DOCS GNOME MATE METACITY OPENBOX PARALLEL PLANK XFCE
 OPTIONS_DEFAULT=	CINNAMON GNOME MATE METACITY OPENBOX PARALLEL PLANK XFCE
 OPTIONS_SUB=	yes
 
 CINNAMON_DESC=	Enable Cinnamon support
 CINNAMON_CONFIGURE_ENABLE=	cinnamon
 CINNAMON_IMPLIES=	METACITY
 GNOME_DESC=	Enable Gnome support
 GNOME_CONFIGURE_ENABLE=	gnome
 MATE_DESC=	Enable Mate support
 MATE_CONFIGURE_ENABLE=	mate
 MATE_IMPLIES=	METACITY
 MATE_BUILD_DEPENDS=	${LOCALBASE}/lib/libmarco-private.so:x11-wm/marco
 METACITY_DESC=	Enable Metacity support
 OPENBOX_DESC=	Enable Openbox support
 OPENBOX_CONFIGURE_ENABLE=	openbox
 PARALLEL_DESC=	Enable parallel build
 PARALLEL_BUILD_DEPENDS=	parallel:sysutils/parallel
 PARALLEL_CONFIGURE_ENABLE=	parallel
 PLANK_DESC=	Enable Plank support
 PLANK_CONFIGURE_ENABLE=	plank
 XFCE_DESC=	Enable Xfce support
 XFCE_CONFIGURE_ENABLE=	xfce
 
 post-extract:
 	${CP} ${WRKSRC}/src/shell/sass/gnome-shell/README.window-list ${WRKSRC}
 
 post-patch:
 	(cd ${WRKSRC} && \
 	${FIND} . -type f -iregex '${SHEBANG_REGEX}' \
 		-exec ${SED} -i '' -e "s/sed -i/& ''/g" {} ';')
 	${REINPLACE_CMD} -e 's|/usr|${LOCALBASE}|; s|$${prefix}|${PREFIX}|' \
 		${WRKSRC}/README.window-list
 
 post-install:
 	${RM} ${STAGEDIR}${PREFIX}/share/themes/Plata/COPYING
 	${RM} ${STAGEDIR}${PREFIX}/share/themes/Plata/LICENSE_CC_BY_SA4
 	${RM} ${STAGEDIR}${PREFIX}/share/themes/Plata/gnome-shell/extensions/window-list/README
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_MAN} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/x11/py-caffeine-ng/Makefile b/x11/py-caffeine-ng/Makefile
index 89d6ce928334..4969fe694d62 100644
--- a/x11/py-caffeine-ng/Makefile
+++ b/x11/py-caffeine-ng/Makefile
@@ -1,68 +1,68 @@
 # $FreeBSD$
 
 PORTNAME=	caffeine-ng
 DISTVERSION=	3.4.2
 PORTREVISION=	1
 CATEGORIES=	x11 python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	tagattie@yandex.com
+MAINTAINER=	tagattie@FreeBSD.org
 COMMENT=	Tray bar app to temporarily inhibit screensaver and sleep mode
 
 LICENSE=	GPLv3+ LGPL3+
 LICENSE_COMB=	multi
 LICENSE_FILE_GPLv3+ =	${WRKSRC}/LICENCE
 LICENSE_FILE_LGPL3+ =	${WRKSRC}/LGPL
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR}
 LIB_DEPENDS=	libappindicator3.so:devel/libappindicator \
 		libnotify.so:devel/libnotify
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}docopt>=0.6.2:devel/py-docopt@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ewmh>=0.1.4:devel/py-ewmh@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}xdg>=0.25:devel/py-xdg@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}setproctitle>=1.1.10:devel/py-setproctitle@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0.29.0:devel/py-wheel@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dbus>0:devel/py-dbus@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tox>0:devel/py-tox@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}flake8>0:devel/py-flake8@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}flake8-import-order>0:devel/py-flake8-import-order@${PY_FLAVOR}
 
 USES=		desktop-file-utils gettext-tools gnome python:3.3+
 USE_GNOME=	gdkpixbuf2 gtk30 pygobject3
 USE_PYTHON=	autoplist distutils
 
 NO_ARCH=	yes
 
 GLIB_SCHEMAS=	net.launchpad.caffeine.gschema.xml
 INSTALLS_ICONS=	yes
 
 OPTIONS_DEFINE=	DOCS
 
 PORTDOCS=	README.rst
 
 REINPLACE_ARGS=	-i ""
 
 SCHEMASDIR=	share/glib-2.0/schemas
 
 post-patch:
 	${REINPLACE_CMD} -e 's|/usr|${LOCALBASE}|g; s|/etc|${LOCALBASE}/etc|g' \
 		${WRKSRC}/setup.py \
 		${WRKSRC}/share/applications/*.desktop
 
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/${SCHEMASDIR}
 .for schema in ${GLIB_SCHEMAS}
 	${INSTALL_DATA} ${WRKSRC}/${SCHEMASDIR}/${schema} ${STAGEDIR}${PREFIX}/${SCHEMASDIR}
 .endfor
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for doc in ${PORTDOCS}
 	${INSTALL_MAN} ${WRKSRC}/${doc} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 do-test:
 	cd ${TEST_WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} -m tox
 
 .include <bsd.port.mk>