From nobody Fri Mar 11 21:24:36 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 34FF01A0C0F3; Fri, 11 Mar 2022 21:24:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KFf8P126rz3jll; Fri, 11 Mar 2022 21:24:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647033877; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dBDK08493yeKw0D/kFmwG/hPHP4O1VBmNbEznzL65aU=; b=KrnOMJRMo0suearaZ9L8nn01RGIBg6R6up6SoQFz6b0ZXErlirz35Lkj+H8yKU0EZsTOhk 8DF5ovD6/y1HC7X5q2OjRFlS9e/dJKcXMhYgK8DG1HFq0GGO3cm/zV6thg3lveXPeYnLg7 1WV9fpZlgCaHHJb/Rm20A/7MYvJ+Ij8jYvP4BaJHvUJscRXjSXDJeY/9ocF8xEGPxnvnz4 PjgxzeIDNwJ0YrzdBNDVktpUTvMv2XfjSKfUF7YgcJDN1TTfgbj/hre63IUZRR+jhQ18SQ uVddgzL60YTXnavo5nV9zZWQnop3kjNjzHNQ9/wBGKNDgET95yZpq98TtxTNPA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 03BF6206CD; Fri, 11 Mar 2022 21:24:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 22BLOauL075513; Fri, 11 Mar 2022 21:24:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22BLOaLS075512; Fri, 11 Mar 2022 21:24:36 GMT (envelope-from git) Date: Fri, 11 Mar 2022 21:24:36 GMT Message-Id: <202203112124.22BLOaLS075512@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Sergey A. Osokin" Subject: git: a9108d8c085c - main - */*: add new port NGINX JavaScript (njs) command line utility List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: osa X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a9108d8c085c83e3158abb661908d343b0eb5d9c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647033877; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dBDK08493yeKw0D/kFmwG/hPHP4O1VBmNbEznzL65aU=; b=xxs+flOq2PsUm1zDb5UEhknzFXxGmARGEkRtKnwLXVPHJl+qeJOuEtp1lySDnJwxpqEJq7 wyQvk9fZBEogoyjsf7+wFHACcvyeS/+cEBN4WWXGiCxcfCXMHZNSjeDfDlwOsAFESbMYJL S+BF5psnDxgzLYb37P2+SQjYBvOGCGezCi9QSdWUTccQzi2BsW9xfh0Hq1lQJ4Qso8JYVk SPS543brS4BEsaGQUFOkuWYeNTRxpYYcxtu20IPn1c595Fp4VTwXBN3EwTRVChpvgvqHAn U7JP7C+wvKFcnr3GkqsYC7k6txIQsA66NzAZUJOdRE5BlNsgBQbcOyVMughmKg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1647033877; a=rsa-sha256; cv=none; b=uJR9UWbYrqmaBhLYDlZ/R8xbat8sCfXiBIlYf+ucuc3rnkj+vphvatlwvy2GggqkMVAfgj ZT5JcxuXG4piZc/Onvfqc2vMJPnM2eGtcmDZ+iJ2uMdMSNLhp9WIsFTQ8pK5yeTD4q9YKl zPrit9zIGvVsf4RCUBFotiBgKhkmKklMgxYvwnXmtIMwtK5GCVtaIhJJERIMT+iqAgVbZm gcI+64G2JF5BCt2k8xEPUNud3+u8Tf6Ya9EJ0B4KO/4JvBbT3UMnUTiGR6UkUkQuBBb90W cj7TKfcp0KggBiaDpmdWNEVeCwMJein/bYAjjGE5/ElmrSQYv6aFmk6UUQ0Pww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by osa: URL: https://cgit.FreeBSD.org/ports/commit/?id=a9108d8c085c83e3158abb661908d343b0eb5d9c commit a9108d8c085c83e3158abb661908d343b0eb5d9c Author: Sergey A. Osokin AuthorDate: 2022-03-11 21:21:24 +0000 Commit: Sergey A. Osokin CommitDate: 2022-03-11 21:24:27 +0000 */*: add new port NGINX JavaScript (njs) command line utility NGINX JavaScript, also knows as njs, is a subset of the JavaScript language that allows extending nginx functionality. njs is created in compliance with ECMAScript 5.1 (strict mode) with some ECMAScript 6 and later extensions. It's easy to use njs command line utility to develop and debug additional functionality. Also, it's light-weight and very useful as a shebang in some cases as the nodejs substitutor. Remove build of njs command-line utlity from the www/nginx-devel (*) process. Bump PORTREVISION. (*) --- lang/Makefile | 1 + lang/njs/Makefile | 49 +++++++++++++++++++++++++++++++++++++++++++++++ lang/njs/distinfo | 3 +++ lang/njs/pkg-descr | 6 ++++++ www/nginx-devel/Makefile | 9 ++------- www/nginx-devel/pkg-plist | 1 - 6 files changed, 61 insertions(+), 8 deletions(-) diff --git a/lang/Makefile b/lang/Makefile index 82d6c5f1464c..d342c4d55418 100644 --- a/lang/Makefile +++ b/lang/Makefile @@ -198,6 +198,7 @@ SUBDIR += nhc98 SUBDIR += nickle SUBDIR += nim + SUBDIR += njs SUBDIR += nqc SUBDIR += nwcc SUBDIR += nx diff --git a/lang/njs/Makefile b/lang/njs/Makefile new file mode 100644 index 000000000000..5f9c3a1a63e4 --- /dev/null +++ b/lang/njs/Makefile @@ -0,0 +1,49 @@ +# Created by: Sergey A. Osokin + +PORTNAME= njs +DISTVERSION= 0.7.2 +CATEGORIES= lang www +#DISTFILES= ${DISTNAME}${EXTRACT_SUFX} + +MAINTAINER= osa@FreeBSD.org +COMMENT= NGINX JavaScript command line utility + +LICENSE= BSD2CLAUSE +LICENSE_FILE= ${WRKSRC}/LICENSE + +USES= cpe + +CONFLICTS_INSTALL= www/nginx + +CPE_VENDOR= f5 +CPE_PRODUCT= njs + +USE_GITHUB= yes +GH_TUPLE= nginx:njs:0.7.2 +HAS_CONFIGURE= yes + +OPTIONS_DEFINE= SSL +OPTIONS_RADIO+= PCRE +OPTIONS_RADIO_PCRE= NOPCRE PCRE_ONE PCRE_TWO +NOPCRE_CONFIGURE_ON= --no-pcre +PCRE_ONE_LIB_DEPENDS= libpcre.so:devel/pcre +PCRE_ONE_CONFIGURE_ON= --no-pcre2 +PCRE_TWO_LIB_DEPENDS= libpcre2-8.so:devel/pcre2 +OPTIONS_DEFAULT= PCRE_ONE SSL +SSL_CONFIGURE_OFF= --no-openssl +SSL_USES= ssl + +NOPCRE_DESC= Disable PCRE support +PCRE_ONE_DESC= Enable PCRE1 support +PCRE_TWO_DESC= Enable PCRE2 support +SSL_DESC= Enable OpenSSL support + +PLIST_FILES= bin/njs + +do-build: + @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} njs + +do-install: + ${INSTALL_PROGRAM} ${WRKSRC}/build/njs ${STAGEDIR}${PREFIX}/bin + +.include diff --git a/lang/njs/distinfo b/lang/njs/distinfo new file mode 100644 index 000000000000..f784df6b1edb --- /dev/null +++ b/lang/njs/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1647025367 +SHA256 (nginx-njs-0.7.2_GH0.tar.gz) = a1481be96989842ed05d06eab4ae4e79790c552196e5624dd38d42bc2d275829 +SIZE (nginx-njs-0.7.2_GH0.tar.gz) = 584483 diff --git a/lang/njs/pkg-descr b/lang/njs/pkg-descr new file mode 100644 index 000000000000..24fb6fab09a0 --- /dev/null +++ b/lang/njs/pkg-descr @@ -0,0 +1,6 @@ +njs scripting language, or just njs, is a subset of the JavaScript language +that allows extending nginx functionality. njs is created in compliance +with ECMAScript 5.1 (strict mode) with some ECMAScript 6 and later +extensions. The compliance is still evolving. + +WWW: https://nginx.org/en/docs/njs/ diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile index d668a3da51bf..261d2812f327 100644 --- a/www/nginx-devel/Makefile +++ b/www/nginx-devel/Makefile @@ -2,7 +2,7 @@ PORTNAME?= nginx PORTVERSION= 1.21.6 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= www MASTER_SITES= https://nginx.org/download/ \ LOCAL/osa @@ -325,9 +325,7 @@ pre-configure-SMALL_LIGHT-on: ( cd ${WRKSRC_small_light} && ./setup ) do-configure-NJS-on: - ( cd ${WRKSRC_njs} && ${SETENV} ${CONFIGURE_ENV} ${CONFIGURE_CMD} ${NJS_CONFIGURE_ARGS} \ - && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} njs \ - && ${MV} build/njs ${WRKSRC_njs} ) + ( cd ${WRKSRC_njs} && ${SETENV} ${CONFIGURE_ENV} ${CONFIGURE_CMD} ${NJS_CONFIGURE_ARGS} ) .if !target(do-install) do-install: @@ -362,9 +360,6 @@ do-install-NAXSI-on: ${INSTALL_DATA} \ ${WRKDIR}/naxsi-${NAXSI_NGINX_VER}/naxsi_config/naxsi_core.rules \ ${STAGEDIR}${ETCDIR} - -do-install-NJS-on: - ${INSTALL_PROGRAM} ${WRKSRC_njs}/njs ${STAGEDIR}${PREFIX}/sbin .endif .if !target(post-install) diff --git a/www/nginx-devel/pkg-plist b/www/nginx-devel/pkg-plist index a43460352509..21af73d2e6d3 100644 --- a/www/nginx-devel/pkg-plist +++ b/www/nginx-devel/pkg-plist @@ -87,7 +87,6 @@ %%DSO%%%%XSS%%libexec/nginx/ngx_http_xss_filter_module.so %%HTTP_PERL%%%%SITE_ARCH%%/auto/nginx/nginx.so %%HTTP_PERL%%%%SITE_ARCH%%/nginx.pm -%%NJS%%sbin/njs sbin/nginx share/vim/vimfiles/ftdetect/nginx.vim share/vim/vimfiles/ftplugin/nginx.vim