Date: Fri, 29 Apr 2022 13:24:46 GMT From: Matthias Fechner <mfechner@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: e043b6e4bbca - main - textproc/rubygem-kramdown23: fixed conflict with bin/kramdown Message-ID: <202204291324.23TDOkQa047371@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=e043b6e4bbca869a30ae2292b0d5c710493a6be5 commit e043b6e4bbca869a30ae2292b0d5c710493a6be5 Author: Matthias Fechner <mfechner@FreeBSD.org> AuthorDate: 2022-04-29 12:20:35 +0000 Commit: Matthias Fechner <mfechner@FreeBSD.org> 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 <bsd.port.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202204291324.23TDOkQa047371>