Index: head/editors/atom/Makefile
===================================================================
--- head/editors/atom/Makefile	(revision 528592)
+++ head/editors/atom/Makefile	(revision 528593)
@@ -1,251 +1,252 @@
 # $FreeBSD$
 
 PORTNAME=	atom
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.44.0
+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
 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=${ELECTON_VER} \
+		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=${ELECTON_VER} \
+				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>
Index: head/editors/atom/distinfo
===================================================================
--- head/editors/atom/distinfo	(revision 528592)
+++ head/editors/atom/distinfo	(revision 528593)
@@ -1,11 +1,11 @@
-TIMESTAMP = 1581749918
+TIMESTAMP = 1584423742
 SHA256 (node-v10.2.1.tar.gz) = dcdba29f6b933969d6a8a36ea91cfd44bcb500a1e582a3273ac3d4d930e721e4
 SIZE (node-v10.2.1.tar.gz) = 35757099
 SHA256 (jasmine-tagged-1.1.4.tar.gz) = 8988597858ddf9e9ba3333a19d8651691c8384117bf2e362e8a5ba193ed47585
 SIZE (jasmine-tagged-1.1.4.tar.gz) = 3071259
-SHA256 (atom-npm-cache-1.44.0.tar.gz) = 0dcab4ae60f05add0ffc0bddc45542fa9de58095e1e4c195b7fe6da07871fd3f
-SIZE (atom-npm-cache-1.44.0.tar.gz) = 42467992
-SHA256 (atom-apm-cache-1.44.0.tar.gz) = 4426bd88a55c9521d850eea01859dc6d2dff7f202115206c97c0ee342f9ec1bd
-SIZE (atom-apm-cache-1.44.0.tar.gz) = 115336084
-SHA256 (atom-atom-v1.44.0_GH0.tar.gz) = 8d79697b0c969f22ee8dc2c1d27c608036e92deaf63574f8cd1509ea506eded9
-SIZE (atom-atom-v1.44.0_GH0.tar.gz) = 11909698
+SHA256 (atom-npm-cache-1.45.0.tar.gz) = ebeb3e4df2e149a3935306ac826a045af6be6ded6b90aaca252278479da8f414
+SIZE (atom-npm-cache-1.45.0.tar.gz) = 42498756
+SHA256 (atom-apm-cache-1.45.0.tar.gz) = 7f3cb00b4fa1dd4e4ba5741bd890b93d3486cdba59e77991d3f4e190807bbc3a
+SIZE (atom-apm-cache-1.45.0.tar.gz) = 118410560
+SHA256 (atom-atom-v1.45.0_GH0.tar.gz) = 9d50468ef1c8e1027881f245d205f3ab8446dcf6c40726a3f562de035f46af52
+SIZE (atom-atom-v1.45.0_GH0.tar.gz) = 11909782
Index: head/editors/atom/files/atom/patch-node__modules_github_package.json
===================================================================
--- head/editors/atom/files/atom/patch-node__modules_github_package.json	(revision 528592)
+++ head/editors/atom/files/atom/patch-node__modules_github_package.json	(revision 528593)
@@ -1,10 +1,10 @@
---- node_modules/github/package.json.orig	2020-02-15 07:00:39 UTC
+--- node_modules/github/package.json.orig	2020-03-17 05:46:57 UTC
 +++ node_modules/github/package.json
 @@ -215,7 +215,6 @@
      "dedent-js": "1.0.1",
      "electron-devtools-installer": "2.2.4",
-     "electron-link": "0.4.0",
+     "electron-link": "0.4.1",
 -    "electron-mksnapshot": "^4.2.0",
      "enzyme": "3.10.0",
      "enzyme-adapter-react-16": "1.7.1",
-     "eslint": "6.7.0",
+     "eslint": "6.7.2",
Index: head/editors/atom/files/atom/patch-node__modules_github_test_github-package.test.js
===================================================================
--- head/editors/atom/files/atom/patch-node__modules_github_test_github-package.test.js	(revision 528592)
+++ head/editors/atom/files/atom/patch-node__modules_github_test_github-package.test.js	(revision 528593)
@@ -1,20 +1,20 @@
---- node_modules/github/test/github-package.test.js.orig	2019-12-11 02:42:35 UTC
+--- node_modules/github/test/github-package.test.js.orig	2020-02-05 20:24:36 UTC
 +++ node_modules/github/test/github-package.test.js
-@@ -935,7 +935,7 @@ describe('GithubPackage', function() {
+@@ -1040,7 +1040,7 @@ describe('GithubPackage', function() {
  
      describe('when a file change is made outside Atom in workspace 1', function() {
        beforeEach(function() {
 -        if (process.platform === 'linux') {
 +        if (process.platform === 'linux' || process.platform === 'freebsd') {
            this.skip();
          }
  
-@@ -953,7 +953,7 @@ describe('GithubPackage', function() {
+@@ -1058,7 +1058,7 @@ describe('GithubPackage', function() {
  
      describe('when a file change is made outside Atom in workspace 2', function() {
        beforeEach(function() {
 -        if (process.platform === 'linux') {
 +        if (process.platform === 'linux' || process.platform === 'freebsd') {
            this.skip();
          }