From nobody Fri Apr 29 13:24:46 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 97A491AB0727; Fri, 29 Apr 2022 13:24:46 +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 4KqYB63rlmz3jBd; Fri, 29 Apr 2022 13:24:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651238686; 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=cE5r3iI1k6xT8PY7eBiGlgufPItOrYK/LZfj8vkoiyY=; b=WnKobpOXobC3buNIKNqi8Cg5XZrqvwlpkVEyzXQw/OQUxWFT3CtoFA7Gm81iT7tOBH5iFn qexZrdNDbGtBwxGoGzco5mElXAULpbl47maE4lQgml3yHX4JJJVy271dNYeIAwkKa1lItf w4ipmuA3flvObVmV5wDw+1rXN0pibOJ4LlTHBsizDKifKi+3VeTlIzoFfLk4bxLC109YVX dWVAKEnUEml9nOg4LkaDN26lExH8x08c/jdV1Tsn3PzozJS1FQtP2fUtdx5/wmk1kawZEk Yg3TUwrlGFgsGoFoFeeyryu+291AJ9aUh+yGJY3hFlpOCwRer7/ysc41OI6MRw== 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 6402D5665; Fri, 29 Apr 2022 13:24:46 +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 23TDOkJ1047372; Fri, 29 Apr 2022 13:24:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23TDOkQa047371; Fri, 29 Apr 2022 13:24:46 GMT (envelope-from git) Date: Fri, 29 Apr 2022 13:24:46 GMT Message-Id: <202204291324.23TDOkQa047371@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Matthias Fechner Subject: git: e043b6e4bbca - main - textproc/rubygem-kramdown23: fixed conflict with bin/kramdown 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: mfechner X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e043b6e4bbca869a30ae2292b0d5c710493a6be5 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651238686; 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=cE5r3iI1k6xT8PY7eBiGlgufPItOrYK/LZfj8vkoiyY=; b=Hr4w5qD4p47bVDSyJv0rdZM2SW2BMOdOJ2BbhjjRWoqI6pfmd5HuY9NlY3XTEqpcdPOeIU YhLt/pvEzSmplTlBVDlgg3G2UmboBMEzF9oaeHmq4GdqH/w7t6Na8F3NRWO2yRtXRgSK3I VsWZU7pbJDptNCDbJklRbO9NL1DOMlHyQJ8X+8smwTAGWL/coqYzsR4lmAQqdubHdR9I6T XirAN2B6akCz/M9PdwwmKyQ6alpazwIlICrzyFERYImw1B0y5khQ6N6okaAPTg2ppKLl51 NZJ/rqBRVLV1swQ/zPju/ag2giK1jmg85vMwdQZ07U7wV0ZivozPfSU17sFEzQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651238686; a=rsa-sha256; cv=none; b=h8m6ZXsq8Ax+zmIxsrtF4tECeThveasV9Z92wv/DlSZhdizDlnOZH1lLSZWqJXq6gcN4vj gYtEP78RJuurNxCaNkJhf8Z7cDHm8AzHOU2ylb+RoYxFCY5Px8MFss75wqnYhMR9wJsz1C 7jskWZ5Syq4cFO2bpxpBGIMkI6+rlqPArzl6kzakQ3XJsecMwPcsXr6GKHdArE5wS6WZuN YmglU/tVhKC9wZFSHpx6RTyDZ5iZ7yddSOjkZ+m88nh0ZvRp7DB63U4Y8ahr540PbZGd4f nWHvp20YtNV6sUznD5mlfrzca98QpqIsLL0Q12Z4Ix7y+v8YUNwBmi7qXJ5NKw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=e043b6e4bbca869a30ae2292b0d5c710493a6be5 commit e043b6e4bbca869a30ae2292b0d5c710493a6be5 Author: Matthias Fechner AuthorDate: 2022-04-29 12:20:35 +0000 Commit: Matthias Fechner CommitDate: 2022-04-29 13:16:40 +0000 textproc/rubygem-kramdown23: fixed conflict with bin/kramdown This fixes a regression introduced by: 75f5671a8203881810cddb4d7166c15102eba04f 0c0c1aa14947d33a2c98eb78a3e32d48ed7ba5f0 217af8968cd618690a994d535e6b6628f26dcaf0 It caused a conflict as port textproc/rubygem-kramdown installs same binary (bin/kramdown) as textproc/rubygem-kramdown23. PR: 263606 --- textproc/rubygem-kramdown23/Makefile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/textproc/rubygem-kramdown23/Makefile b/textproc/rubygem-kramdown23/Makefile index ad7878ee9382..fd998d25e6d9 100644 --- a/textproc/rubygem-kramdown23/Makefile +++ b/textproc/rubygem-kramdown23/Makefile @@ -2,6 +2,7 @@ PORTNAME= kramdown PORTVERSION= 2.3.2 +PORTREVISION= 1 CATEGORIES= textproc rubygems MASTER_SITES= RG PKGNAMESUFFIX= 23 @@ -19,10 +20,14 @@ USE_RUBY= yes NO_ARCH= yes -PLIST_FILES= bin/kramdown +#PLIST_FILES= bin/kramdown CPE_VENDOR= kramdown_project PORTSCOUT= limit:^2\.3\. +# Avoid CONFLICTS_INSTALL with textproc/rubygem-kramdown +post-install: + ${RM} ${STAGEDIR}${PREFIX}/bin/kramdown + .include