diff --git a/mail/mailpit/Makefile b/mail/mailpit/Makefile
index 7d1e7d98942ef..c4fece5741985 100644
--- a/mail/mailpit/Makefile
+++ b/mail/mailpit/Makefile
@@ -13,9 +13,6 @@ WWW=		https://github.com/axllent/mailpit
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-ONLY_FOR_ARCHS=	aarch64 amd64
-ONLY_FOR_ARCHS_REASON=	Unsupported platform by required npm module
-
 BUILD_DEPENDS+=	npm>0:www/npm
 
 USES=		go:modules tar:zstd
@@ -91,7 +88,7 @@ pre-build:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} npm run build
 
 # (for maintainer) helper target to generate node_modules tarball
-make-npm-cache: extract
+make-npm-cache: patch
 	@cd ${WRKDIR} && ${RM} -r .npm
 	@cd ${WRKSRC} && ${SETENV} HOME=${WRKDIR} npm ci
 	@cd ${WRKDIR} \
diff --git a/mail/mailpit/distinfo b/mail/mailpit/distinfo
index 8f73f8a44f2a4..2b3a6deb17815 100644
--- a/mail/mailpit/distinfo
+++ b/mail/mailpit/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1682440772
-SHA256 (mailpit-npm-cache-1.6.5.tar.zst) = 1f407be06dc5d15ef3d5d211188eb2c043ef742d0dbb53f17331776630a0e23f
-SIZE (mailpit-npm-cache-1.6.5.tar.zst) = 25903633
+TIMESTAMP = 1682846536
+SHA256 (mailpit-npm-cache-1.6.5.tar.zst) = c916be044041890a2e38533be7b3100bf9f924c32588401c018a4a41745388d5
+SIZE (mailpit-npm-cache-1.6.5.tar.zst) = 28857889
 SHA256 (axllent-mailpit-v1.6.5_GH0.tar.gz) = 6c2d99dab0f6ae6f937b1372238f7b7cea7c286ca4a8c60eeba506e42e9fabc1
 SIZE (axllent-mailpit-v1.6.5_GH0.tar.gz) = 230966
 SHA256 (DATA-DOG-go-sqlmock-v1.5.0_GH0.tar.gz) = b78616fddfcc76892aecb5344968d7f3843128b70eba6c4752f092dc992c3b98
diff --git a/mail/mailpit/files/patch-package-lock.json b/mail/mailpit/files/patch-package-lock.json
new file mode 100644
index 0000000000000..87069162f8065
--- /dev/null
+++ b/mail/mailpit/files/patch-package-lock.json
@@ -0,0 +1,217 @@
+--- package-lock.json.orig	2023-04-30 09:15:38 UTC
++++ package-lock.json
+@@ -21,9 +21,9 @@
+       "devDependencies": {
+         "@popperjs/core": "^2.11.5",
+         "@vue/compiler-sfc": "^3.2.37",
+-        "esbuild": "^0.17.5",
+         "esbuild-plugin-vue-next": "^0.1.4",
+-        "esbuild-sass-plugin": "^2.3.2"
++        "esbuild-sass-plugin": "^2.3.2",
++        "esbuild-wasm": "^0.17.5"
+       }
+     },
+     "node_modules/@apitools/openapi-parser": {
+@@ -69,6 +69,7 @@
+       "os": [
+         "android"
+       ],
++      "peer": true,
+       "engines": {
+         "node": ">=12"
+       }
+@@ -85,6 +86,7 @@
+       "os": [
+         "android"
+       ],
++      "peer": true,
+       "engines": {
+         "node": ">=12"
+       }
+@@ -101,6 +103,7 @@
+       "os": [
+         "android"
+       ],
++      "peer": true,
+       "engines": {
+         "node": ">=12"
+       }
+@@ -117,6 +120,7 @@
+       "os": [
+         "darwin"
+       ],
++      "peer": true,
+       "engines": {
+         "node": ">=12"
+       }
+@@ -133,6 +137,7 @@
+       "os": [
+         "darwin"
+       ],
++      "peer": true,
+       "engines": {
+         "node": ">=12"
+       }
+@@ -149,6 +154,7 @@
+       "os": [
+         "freebsd"
+       ],
++      "peer": true,
+       "engines": {
+         "node": ">=12"
+       }
+@@ -165,6 +171,7 @@
+       "os": [
+         "freebsd"
+       ],
++      "peer": true,
+       "engines": {
+         "node": ">=12"
+       }
+@@ -181,6 +188,7 @@
+       "os": [
+         "linux"
+       ],
++      "peer": true,
+       "engines": {
+         "node": ">=12"
+       }
+@@ -197,6 +205,7 @@
+       "os": [
+         "linux"
+       ],
++      "peer": true,
+       "engines": {
+         "node": ">=12"
+       }
+@@ -213,6 +222,7 @@
+       "os": [
+         "linux"
+       ],
++      "peer": true,
+       "engines": {
+         "node": ">=12"
+       }
+@@ -229,6 +239,7 @@
+       "os": [
+         "linux"
+       ],
++      "peer": true,
+       "engines": {
+         "node": ">=12"
+       }
+@@ -245,6 +256,7 @@
+       "os": [
+         "linux"
+       ],
++      "peer": true,
+       "engines": {
+         "node": ">=12"
+       }
+@@ -261,6 +273,7 @@
+       "os": [
+         "linux"
+       ],
++      "peer": true,
+       "engines": {
+         "node": ">=12"
+       }
+@@ -277,6 +290,7 @@
+       "os": [
+         "linux"
+       ],
++      "peer": true,
+       "engines": {
+         "node": ">=12"
+       }
+@@ -293,6 +307,7 @@
+       "os": [
+         "linux"
+       ],
++      "peer": true,
+       "engines": {
+         "node": ">=12"
+       }
+@@ -309,6 +324,7 @@
+       "os": [
+         "linux"
+       ],
++      "peer": true,
+       "engines": {
+         "node": ">=12"
+       }
+@@ -325,6 +341,7 @@
+       "os": [
+         "netbsd"
+       ],
++      "peer": true,
+       "engines": {
+         "node": ">=12"
+       }
+@@ -341,6 +358,7 @@
+       "os": [
+         "openbsd"
+       ],
++      "peer": true,
+       "engines": {
+         "node": ">=12"
+       }
+@@ -357,6 +375,7 @@
+       "os": [
+         "sunos"
+       ],
++      "peer": true,
+       "engines": {
+         "node": ">=12"
+       }
+@@ -373,6 +392,7 @@
+       "os": [
+         "win32"
+       ],
++      "peer": true,
+       "engines": {
+         "node": ">=12"
+       }
+@@ -389,6 +409,7 @@
+       "os": [
+         "win32"
+       ],
++      "peer": true,
+       "engines": {
+         "node": ">=12"
+       }
+@@ -405,6 +426,7 @@
+       "os": [
+         "win32"
+       ],
++      "peer": true,
+       "engines": {
+         "node": ">=12"
+       }
+@@ -1288,6 +1310,7 @@
+       "integrity": "sha512-/jUywtAymR8jR4qsa2RujlAF7Krpt5VWi72Q2yuLD4e/hvtNcFQ0I1j8m/bxq238pf3/0KO5yuXNpuLx8BE1KA==",
+       "dev": true,
+       "hasInstallScript": true,
++      "peer": true,
+       "bin": {
+         "esbuild": "bin/esbuild"
+       },
+@@ -1343,6 +1366,18 @@
+       },
+       "peerDependencies": {
+         "esbuild": "^0.17.17"
++      }
++    },
++    "node_modules/esbuild-wasm": {
++      "version": "0.17.18",
++      "resolved": "https://registry.npmjs.org/esbuild-wasm/-/esbuild-wasm-0.17.18.tgz",
++      "integrity": "sha512-h4m5zVa+KaDuRFIbH9dokMwovvkIjTQJS7/Ry+0Z1paVuS9aIkso2vdA2GmwH9GSvGX6w71WveJ3PfkoLuWaRw==",
++      "dev": true,
++      "bin": {
++        "esbuild": "bin/esbuild"
++      },
++      "engines": {
++        "node": ">=12"
+       }
+     },
+     "node_modules/estree-walker": {
diff --git a/mail/mailpit/files/patch-package.json b/mail/mailpit/files/patch-package.json
new file mode 100644
index 0000000000000..6261f0cc10953
--- /dev/null
+++ b/mail/mailpit/files/patch-package.json
@@ -0,0 +1,11 @@
+--- package.json.orig	2023-04-30 09:15:32 UTC
++++ package.json
+@@ -21,7 +21,7 @@
+   "devDependencies": {
+     "@popperjs/core": "^2.11.5",
+     "@vue/compiler-sfc": "^3.2.37",
+-    "esbuild": "^0.17.5",
++    "esbuild-wasm": "^0.17.5",
+     "esbuild-plugin-vue-next": "^0.1.4",
+     "esbuild-sass-plugin": "^2.3.2"
+   }