From nobody Tue Jan 28 21:03:33 2025 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 4YjHnf0dFKz5m7t5; Tue, 28 Jan 2025 21:03:34 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YjHnd5H5vz43p9; Tue, 28 Jan 2025 21:03:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738098213; 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=pjhwBvNudveZHfV00qqMLK+jJetHvyZHUiTIjC68DQ8=; b=D2vCFsXxxWI7BrnxLocL4tX/UZf9e89bp4ygREV5gI8ZI7ZuVxokwKiJIr2khQd+xXSf8l TdVX5h6HnmFoGGtOVUs0q3V0GxeVPN0m6JPuTFecCX4D4fqijB46hVvk9yRM3hyIkAVqYm gzhyYa5sDtiQvrcTd2W7WssA5oYOVnblrLw8zEWmzkbV7X/uZH0n1lgSYAzCDXBTyX5JW+ YHVhQO80/q/QvGnR/+tXuXKUBpkgB/VOYkdH5So2FpWPjFQoWsfTE6noMg43MgQs1v6Z9t mYhhyMl6DIs0pWblIwja/F6jKDhIwHIhFFvDZ4kRtAMo+1+cOBS5Gin94G7eKg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738098213; 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=pjhwBvNudveZHfV00qqMLK+jJetHvyZHUiTIjC68DQ8=; b=ZntoPcAItOrcwGkq8BA72JYwy7+qvcl7uanwaPWinAZPjAKo1KImXKp0RlDG75LHbN6Rrl fHM60ornqvA7V0v2fyM9E8OeBYUurzaEjtgBh1COrviF49AQASKc0UJKd4gchv9qFrDtM6 Z/dxTuAJTS0sShMqccBO8/Nig3GAydK3ZNryJh9PpyoH2FaW52amlo7gk1Efd7HfdrV6oJ A5zC1ZHBw8g5YLHuDJhW9/RXqLxpTPpFRKksSSsL52+PXUrHEI2YKzKvHZCdRptzL2k087 Y4jStuiLurC3RXGST63zTSNfIXhTll24Br9GV6A1NHURATC+wqJJCAwwlcszSQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738098213; a=rsa-sha256; cv=none; b=r2z2/UHlOMNqBIDu7ZAoeQGntq/x1MMPXoTGvDZwZfFsdboAXdVoHBv7zZl7Xoql9EEIY0 poGgsXn0Enwmq8Dn1MzFVCQoswoAx824PV3rTEW9rCtdh6zhvu0v0P5sNZc+SDkOK3KN9j LtDcZK1F47Gg/haCdQsXzVe9+EYV1+VTpBcIrKKVI+mei5mJTe85JLfG5kRnuttCSGEEb/ RNCkm8Oic47bLbws4Ealt/XZvn/Vi6o26V04WHrToIN9oxkLu7e0q5iSbkgRHcp/kgNPZD qW2tl8erm41XeOz37+CLs0dD3RFV33ALuQmqLtCVilUy+pE+KiFNPqdE3oBTeg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YjHnd4tWnzWg4; Tue, 28 Jan 2025 21:03:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 50SL3Xhn014235; Tue, 28 Jan 2025 21:03:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50SL3X9D014232; Tue, 28 Jan 2025 21:03:33 GMT (envelope-from git) Date: Tue, 28 Jan 2025 21:03:33 GMT Message-Id: <202501282103.50SL3X9D014232@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: f4683ac1be44 - main - lang/quickjs: resolve conflict with lang/quickjs-ng 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-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: f4683ac1be44ded112bcbc18f7473aeb47bfee59 Auto-Submitted: auto-generated The branch main has been updated by osa: URL: https://cgit.FreeBSD.org/ports/commit/?id=f4683ac1be44ded112bcbc18f7473aeb47bfee59 commit f4683ac1be44ded112bcbc18f7473aeb47bfee59 Author: Sergey A. Osokin AuthorDate: 2025-01-28 21:01:58 +0000 Commit: Sergey A. Osokin CommitDate: 2025-01-28 21:03:22 +0000 lang/quickjs: resolve conflict with lang/quickjs-ng Bump PORTREVISION. --- lang/quickjs/Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lang/quickjs/Makefile b/lang/quickjs/Makefile index 31da1f00d164..6662e89c22af 100644 --- a/lang/quickjs/Makefile +++ b/lang/quickjs/Makefile @@ -1,5 +1,6 @@ PORTNAME= quickjs DISTVERSION= 2024.01.13-20240727 +PORTREVISION= 1 CATEGORIES= lang devel #MASTER_SITES= https://bellard.org/${PORTNAME}/ #DISTNAME= ${PORTNAME}-${DISTVERSION:S/./-/g} @@ -19,6 +20,8 @@ GH_TAGNAME= 6e2e68f CPE_VENDOR= ${PORTNAME}_project +CONFLICTS= quickjs + TEST_TARGET= test .include