From nobody Fri Mar 11 21:49:58 2022 X-Original-To: dev-commits-ports-all@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 DF6901A10D19; Fri, 11 Mar 2022 21:49:58 +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 4KFfjf5xjsz3lxv; Fri, 11 Mar 2022 21:49:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647035398; 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=vmV+3eLWr+7kiA6LUFhn4J88CN7twiCdI55j2K9wQMs=; b=qkxowEmbEbDAPcSxXnZrmAlVHGpSaR95XLfxZPMaoOieBD3BjhiXCGjBJGHuumbqONxQ4q eQLL5tv8eTt5lg+elMUj5wRZgHWdrmQyLM8C92P29RQ7J5zaTtAXOz8+3+VRuZRnSOIN49 J5y0OBBITpjiulN5UulSeC4aDuakNVjcypjrMyWafXcQgWF7FLTzvvjwYrbt8ZgjhdQ80t CO5zKcQ/f/TWNXknMeoH53EYk3uMCkRbNi1ozOjjcPARbkTi3dki/xkgGAn21Y6iVBK4PW /pTyF16umXiijm6GE4VuJE9jX83vtcfajIhth2DhFUyhznkVwXsR74d+vPCNXA== 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 ABB4720EBC; Fri, 11 Mar 2022 21:49:58 +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 22BLnwgm002134; Fri, 11 Mar 2022 21:49:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22BLnwHh002133; Fri, 11 Mar 2022 21:49:58 GMT (envelope-from git) Date: Fri, 11 Mar 2022 21:49:58 GMT Message-Id: <202203112149.22BLnwHh002133@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: f70a105964fe - main - lang/njs: resolve conflict List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: f70a105964fe1479d0835f0893d8789dbef27dce Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647035398; 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=vmV+3eLWr+7kiA6LUFhn4J88CN7twiCdI55j2K9wQMs=; b=KDjoOooYkXfK+MnCvNJmA9JCD8AwLJm3kZ6so9V19fOMsPteL8wAdXldS/ocGp0I3bnefQ z4yRRrpbRxziUD292+5iM+saTXTGI0OAWMM9eoNs+ayT4JMkpTX3elDkc4oU1DirT6e1TB PH0NshsTVFuyD7S+qsgcwHJbbb8/hyq0rBRLcsst8BvxwPEpw4SiVEQ0WoiKjTM9ar2xMz Ww+iTau7cvmPcthS3YvtHkadG5KekgHb8+TNkwp3c26Hzat5Y/VVpUvh2s/YAUxWAJ7zZ0 sRJ24qhpEE95ayX8RpGaKS876E+p35DiNm3Cy19nnBxQ1xSgFfvZj1500phpEg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1647035398; a=rsa-sha256; cv=none; b=cVnwsE2IiTkWCOn/MX7mkQNQDO1pDBxR+MIj7QW/K4lyINf6PYgUp34g1E6uZMVb5twiQi bILHmLK4+HhC3VUNVKdR5BZNrBrQUxN5FP+qZKB/baPFb+KSjXxVz9hrmkYqsqlo7tCOBr Im6rwwIz02I9yRh0TlEHDUiDiaX+QnjKpSA+4IeGcMuxU0J0qCXv1AP7h6KlGvRVoAhvTg vuesHFVc6Y2qZt9J86QNiOeoYTTYtwr6KV3S7snQHBpG8lTDMDXYotjOvzdPARSD191Wb3 OdZooHS2vw2i0RN4s06GK1wg/lnWETXjsj6qAi4OT8CktUgxikNl7MKiIKUNrA== 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=f70a105964fe1479d0835f0893d8789dbef27dce commit f70a105964fe1479d0835f0893d8789dbef27dce Author: Sergey A. Osokin AuthorDate: 2022-03-11 21:45:26 +0000 Commit: Sergey A. Osokin CommitDate: 2022-03-11 21:45:26 +0000 lang/njs: resolve conflict www/nginx installs njs command line utility into ${PREFIX}/sbin, so no conflict. Bump PORTREVISION. --- lang/njs/Makefile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lang/njs/Makefile b/lang/njs/Makefile index 5f9c3a1a63e4..b2afb43afb35 100644 --- a/lang/njs/Makefile +++ b/lang/njs/Makefile @@ -2,8 +2,8 @@ PORTNAME= njs DISTVERSION= 0.7.2 +PORTREVISION= 1 CATEGORIES= lang www -#DISTFILES= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= osa@FreeBSD.org COMMENT= NGINX JavaScript command line utility @@ -13,8 +13,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE USES= cpe -CONFLICTS_INSTALL= www/nginx - CPE_VENDOR= f5 CPE_PRODUCT= njs