From nobody Sat Mar 12 21:53:52 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 63FFF1A0CFB9; Sat, 12 Mar 2022 21:53:52 +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 4KGGlh2MKQz3rTW; Sat, 12 Mar 2022 21:53:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647122032; 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=cUwW3IEiS2cO5zElwr7xQ0c4XDRqVkLz2/MzgcCbNyg=; b=XMuI4kWkUn0OcUWUrC2/z2KYefH3jb2DbR6fNumfI2yuzLrP+6RBJGUxXZbSYZY4aAkoHX vv0AwsfW8Z+IFLDRlJW/G0lVER9uhqI7jYbHkpDpd8fTZmK+aAQUlJtohnRLaUzCsKOZFU rKJvd3deD/jWQDKttXM3jdycSYoHl7ogzj2OugDzcYTJyeaLbHxpPJxmwY/EWWx3/nX8Aw rvj2RiyTFOM5rV6KBbZLRdxPwhjRfPwhAepI6PcIaIIoMvZl7kx8WbfP3uzusYOLO5uz6O K/D6N1tyq73gF5xzciwfpRAZw9gFB7fsrpjMV/SNIwojesdWboFpr7DJQfmAZg== 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 3151A528F; Sat, 12 Mar 2022 21:53:52 +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 22CLrqDt058932; Sat, 12 Mar 2022 21:53:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22CLrqLg058931; Sat, 12 Mar 2022 21:53:52 GMT (envelope-from git) Date: Sat, 12 Mar 2022 21:53:52 GMT Message-Id: <202203122153.22CLrqLg058931@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jochen Neumeister Subject: git: 9e2f203aa66e - main - www/nginx: changes in the njs module 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: joneum X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9e2f203aa66ed3a8ee1497230ef0c4336ad91303 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647122032; 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=cUwW3IEiS2cO5zElwr7xQ0c4XDRqVkLz2/MzgcCbNyg=; b=NYdNHnanVlsL3j+9wpW6tyMfIL8ehd6tqZgF5kBtNdMySIxY576NfNHhM/zrdKzZ5oV2/S e+G+k58GEx+wlJ9yLsJQeB59km+TJvGXk2Fxp8DJETe1BH6HxAV8RxYXSMkoVwKwzjl3AE nUyuT0cXSc1EXwZKp+V9oKoK/sNg3+bhXsUZMBhZ/+8ocdlzJ+LoImCowUAYpWdq6bnyjl Lwr/x0xcUvXZbkdhGTsdEObyvEFv2vwIVf9sgR7JvT4sIaOhvynwDqwBXMm9Ee4eLjmsZE 2InG6XnPU3y9+vMRWPEHXEAh0k+YI7qQfGu/eUdRlfImL6hyStXCV2tfinRJUw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1647122032; a=rsa-sha256; cv=none; b=MOFR0hdZPYf/Rcn/Jso5M6mjNO0tZxdhkDo34EmoYiFWxlNKkpzdmfoxxLQEcq6VDDFaHM LZUVsASTdVWp4EgOTQkPxfx778Dy8OzqhlqhgshF1DGJs9B4IH7l6TljaiUTWp23pplOMY uBEqbLvIxkPirJ73EQi/W9hJfFE+nqP8gonaOyIoXVGTGRdzgxF4ngsI/IyPM2TpCI07zD 2t67rDBoV8t1TVMSGDqbOlVhoZF/EX/A5Br80a8RbxIRGtiHvNOGB4s1SGWPn3rBObIBH8 CMc3SVvpvJG/bAozwVWL8VscFkf4JF1T8Y3ndVotdnOd+HWSWtZ2gZt/mLzDOg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by joneum: URL: https://cgit.FreeBSD.org/ports/commit/?id=9e2f203aa66ed3a8ee1497230ef0c4336ad91303 commit 9e2f203aa66ed3a8ee1497230ef0c4336ad91303 Author: Jochen Neumeister AuthorDate: 2022-03-12 21:50:09 +0000 Commit: Jochen Neumeister CommitDate: 2022-03-12 21:53:46 +0000 www/nginx: changes in the njs module @osa has brought lang/njs into the ports, so we can safely remove `njs' command-line utility installation from the www/nginx. PR: 262491 Reported by: osa Sponsored by: Netzkommune GmbH --- www/nginx/Makefile | 4 +--- www/nginx/pkg-plist | 1 - 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/www/nginx/Makefile b/www/nginx/Makefile index 35a3388505b5..04bf391f34a8 100644 --- a/www/nginx/Makefile +++ b/www/nginx/Makefile @@ -2,7 +2,7 @@ PORTNAME= nginx PORTVERSION= 1.20.2 -PORTREVISION?= 8 +PORTREVISION?= 9 PORTEPOCH= 2 CATEGORIES= www MASTER_SITES= https://nginx.org/download/ \ @@ -350,8 +350,6 @@ do-install-NAXSI-on: ${WRKDIR}/naxsi-${NAXSI_NGINX_VER}/naxsi_config/naxsi_core.rules \ ${STAGEDIR}${ETCDIR} -do-install-NJS-on: - ${INSTALL_PROGRAM} ${WRKSRC_njs}/build/njs ${STAGEDIR}${PREFIX}/sbin .endif .if !target(post-install) diff --git a/www/nginx/pkg-plist b/www/nginx/pkg-plist index f89602212b70..db67d46b9121 100644 --- a/www/nginx/pkg-plist +++ b/www/nginx/pkg-plist @@ -89,7 +89,6 @@ %%WWW%%www/nginx-dist/50x.html %%WWW%%@postexec chmod a-w %D/www/nginx-dist %%WWW%%@postunexec if [ -L %D/www/nginx ]; then rm -f %D/www/nginx; fi -%%NJS%%sbin/njs sbin/nginx share/vim/vimfiles/ftdetect/nginx.vim share/vim/vimfiles/ftplugin/nginx.vim