diff --git a/devel/libnjs/Makefile b/devel/libnjs/Makefile
index fbf89b45ed97..dddb6970ddaf 100644
--- a/devel/libnjs/Makefile
+++ b/devel/libnjs/Makefile
@@ -1,37 +1,40 @@
 PORTNAME=	libnjs
 DISTVERSION=	0.8.8
+PORTREVISION=	1
 CATEGORIES=	devel www
 
 MAINTAINER=	osa@FreeBSD.org
 COMMENT=	NGINX JavaScript static library
 WWW=		https://nginx.org/en/docs/njs/
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libpcre2-8.so:devel/pcre2 \
 		libquickjs.so:lang/quickjs
 
 USES=		cpe ssl
 
 CPE_VENDOR=	f5
 
 USE_GITHUB=	yes
 GH_TUPLE=	nginx:njs:${DISTVERSION}
 HAS_CONFIGURE=	yes
+CONFIGURE_ARGS=	--cc-opt="-I${LOCALBASE}/include/quickjs" \
+		--ld-opt="-L${LOCALBASE}/lib" \
+		--with-quickjs
 
 post-patch:
 	${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' \
-		${WRKSRC}/auto/quickjs \
 		${WRKSRC}/src/njs.pc.in
 
 do-build:
 	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} libnjs
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/src/*.h ${STAGEDIR}${PREFIX}/include
 	${INSTALL_DATA} ${WRKSRC}/build/njs_auto_config.h ${STAGEDIR}${PREFIX}/include
 	${INSTALL_DATA} ${WRKSRC}/build/libnjs.a ${STAGEDIR}${PREFIX}/lib
 	${INSTALL_DATA} ${WRKSRC}/build/njs.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig
 
 .include <bsd.port.mk>
diff --git a/devel/libnjs/files/patch-auto_quickjs b/devel/libnjs/files/patch-auto_quickjs
deleted file mode 100644
index 8312bac9b456..000000000000
--- a/devel/libnjs/files/patch-auto_quickjs
+++ /dev/null
@@ -1,15 +0,0 @@
---- auto/quickjs.orig	2024-12-15 17:49:15 UTC
-+++ auto/quickjs
-@@ -46,9 +46,9 @@ if [ $NJS_TRY_QUICKJS = YES ]; then
-     fi
- 
-     if [ $njs_found = no ]; then
--        njs_feature="QuickJS library -I/usr/include/quickjs/ -L/usr/lib/quickjs/ -lquickjs"
--        njs_feature_incs="/usr/include/quickjs/"
--        njs_feature_libs="-L/usr/lib/quickjs/ -lquickjs -lm -ldl -lpthread"
-+        njs_feature="QuickJS library -I%%LOCALBASE%%/include/quickjs/ -L%%LOCALBASE%%/lib/ -lquickjs"
-+        njs_feature_incs="%%LOCALBASE%%/include/quickjs/"
-+        njs_feature_libs="-L%%LOCALBASE%%/lib/ -lquickjs -lm -ldl -lpthread"
- 
-         . auto/feature
-     fi
diff --git a/lang/njs/Makefile b/lang/njs/Makefile
index f52d0541a5ed..36a0d40d1da8 100644
--- a/lang/njs/Makefile
+++ b/lang/njs/Makefile
@@ -1,35 +1,36 @@
 PORTNAME=	njs
 DISTVERSION=	0.8.8
+PORTREVISION=	1
 CATEGORIES=	lang www
 
 MAINTAINER=	osa@FreeBSD.org
 COMMENT=	NGINX JavaScript command line utility
 WWW=		https://nginx.org/en/docs/njs/
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
+LIB_DEPENDS=	libpcre2-8.so:devel/pcre2 \
+		libquickjs.so:lang/quickjs
+
 USES=		cpe ssl
 
 CPE_VENDOR=	f5
 
 USE_GITHUB=	yes
 GH_TUPLE=	nginx:njs:${DISTVERSION}
-HAS_CONFIGURE=	yes
 
-LIB_DEPENDS=	libpcre2-8.so:devel/pcre2 \
-		libquickjs.so:lang/quickjs
+HAS_CONFIGURE=	yes
+CONFIGURE_ARGS=	--cc-opt="-I${LOCALBASE}/include/quickjs" \
+		--ld-opt="-L${LOCALBASE}/lib" \
+		--with-quickjs
 
 PLIST_FILES=	bin/njs
 
-post-patch:
-	${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' \
-		${WRKSRC}/auto/quickjs
-
 do-build:
 	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} njs
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/build/njs ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/lang/njs/files/patch-auto_quickjs b/lang/njs/files/patch-auto_quickjs
deleted file mode 100644
index 8312bac9b456..000000000000
--- a/lang/njs/files/patch-auto_quickjs
+++ /dev/null
@@ -1,15 +0,0 @@
---- auto/quickjs.orig	2024-12-15 17:49:15 UTC
-+++ auto/quickjs
-@@ -46,9 +46,9 @@ if [ $NJS_TRY_QUICKJS = YES ]; then
-     fi
- 
-     if [ $njs_found = no ]; then
--        njs_feature="QuickJS library -I/usr/include/quickjs/ -L/usr/lib/quickjs/ -lquickjs"
--        njs_feature_incs="/usr/include/quickjs/"
--        njs_feature_libs="-L/usr/lib/quickjs/ -lquickjs -lm -ldl -lpthread"
-+        njs_feature="QuickJS library -I%%LOCALBASE%%/include/quickjs/ -L%%LOCALBASE%%/lib/ -lquickjs"
-+        njs_feature_incs="%%LOCALBASE%%/include/quickjs/"
-+        njs_feature_libs="-L%%LOCALBASE%%/lib/ -lquickjs -lm -ldl -lpthread"
- 
-         . auto/feature
-     fi