git: aa316ba7d209 - 2023Q4 - security/gsa: Fix build

The branch 2023Q4 has been updated by acm:

URL: https://cgit.FreeBSD.org/ports/commit/?id=aa316ba7d20994e0f78395f5ee3780692b510206

commit aa316ba7d20994e0f78395f5ee3780692b510206
Author:     Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
AuthorDate: 2023-10-20 07:05:11 +0000
Commit:     Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
CommitDate: 2023-10-23 18:59:49 +0000

    security/gsa: Fix build
    
    - Move from yarn to npm
    PR:             274276
    Reported by:    Trond Endrestøl <Trond.Endrestol _at_ ximalas.info>
    
    (cherry picked from commit 3d5bec0e07b8106bc02a875b7efb27dc7438723f)
---
 security/gsa/Makefile | 25 ++++++++++++-------------
 security/gsa/distinfo |  6 +++---
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/security/gsa/Makefile b/security/gsa/Makefile
index dd950a73ed0d..e0dfa1405e9e 100644
--- a/security/gsa/Makefile
+++ b/security/gsa/Makefile
@@ -1,6 +1,7 @@
 PORTNAME=	gsa
 DISTVERSIONPREFIX=	v
 DISTVERSION=	22.7.1
+PORTREVISION=	2
 CATEGORIES=	security
 
 MAINTAINER=	acm@FreeBSD.org
@@ -9,7 +10,7 @@ WWW=		https://github.com/greenbone/gsa
 
 LICENSE=	AGPLv3+
 
-BUILD_DEPENDS=	yarn:www/yarn
+BUILD_DEPENDS=	npm-node18>0:www/npm-node18
 RUN_DEPENDS=	${LOCALBASE}/sbin/gsad:security/gsad
 
 USES=		nodejs:build
@@ -18,7 +19,7 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	greenbone
 GH_PROJECT=	gsa
 
-YARN_BIN=	${LOCALBASE}/bin/yarn
+NPM_BIN=	${LOCALBASE}/bin/npm
 
 # to rebuild the deps archive:
 #   1. set DEV_UPDATE_MODE=yes
@@ -28,27 +29,25 @@ YARN_BIN=	${LOCALBASE}/bin/yarn
 #   5. make clean makesum
 
 DEV_UPDATE_MODE=	no
-DEPS_CACHE_DIR=		${WRKDIR}
+DEPS_CACHE_DIR=		${WRKSRC}
 
 .if (${DEV_UPDATE_MODE} == "yes")
+NPM_ARGS=	install
 post-build:
-	@cd ${DEPS_CACHE_DIR} && ${TAR} czf ${DISTDIR}/${DIST_SUBDIR}/${PORTNAME}-cache-${DISTVERSION}${EXTRACT_SUFX} yarn-offline-cache
+	@cd ${DEPS_CACHE_DIR} && ${TAR} czf ${DISTDIR}/${DIST_SUBDIR}/${PORTNAME}-cache-${DISTVERSION}${EXTRACT_SUFX} node_modules
 	@${ECHO} "(!!!) Please upload the cache archive: ${DISTDIR}/${DIST_SUBDIR}/${PORTNAME}-cache-${DISTVERSION}${EXTRACT_SUFX}"
 .else
-MASTER_SITES+=	LOCAL/acm/gsa/:yarn_cache
-DISTFILES+=	${PORTNAME}-cache-${DISTVERSION}${EXTRACT_SUFX}:yarn_cache
-YARN_ARGS=	--offline
+MASTER_SITES+=	LOCAL/acm/gsa/:npm_cache
+DISTFILES+=	${PORTNAME}-cache-${DISTVERSION}${EXTRACT_SUFX}:npm_cache
+NPM_ARGS=	run build
 .endif
 
-post-patch:
-	${ECHO_CMD} 'yarn-offline-mirror "${WRKDIR}/yarn-offline-cache"' >> \
-		${WRKSRC}/.yarnrc
+post-extract:
+	@${MV} ${WRKDIR}/node_modules ${WRKSRC}
 
 do-build:
 	@cd ${WRKSRC} && \
-		${YARN_BIN} ${YARN_ARGS}
-	@cd ${WRKSRC} && \
-		${YARN_BIN} ${YARN_ARGS} build
+		${NPM_BIN} ${NPM_ARGS}
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/gvm/gsad/web
diff --git a/security/gsa/distinfo b/security/gsa/distinfo
index 86ac645b05ef..96842f914306 100644
--- a/security/gsa/distinfo
+++ b/security/gsa/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1696261026
-SHA256 (gsa-cache-22.7.1.tar.gz) = 5b03e1e5f8e1afcc1d23567f044eaa60994495a9558a6a3a2a8555df0886a91d
-SIZE (gsa-cache-22.7.1.tar.gz) = 47165900
+TIMESTAMP = 1697784180
+SHA256 (gsa-cache-22.7.1.tar.gz) = cdb0a815e3069eb24f43012ad16a51a9d171a35b04ddae7da769f09651f6d4ed
+SIZE (gsa-cache-22.7.1.tar.gz) = 67963784
 SHA256 (greenbone-gsa-v22.7.1_GH0.tar.gz) = 89c159db61df19fe21713fa02c0454e730653673e7ef9b4dc30485666a631a05
 SIZE (greenbone-gsa-v22.7.1_GH0.tar.gz) = 3607415