Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mail.NetBSD.org", Issuer "mail.NetBSD.org CA" (not verified)) by mollari.NetBSD.org (Postfix) with ESMTPS id C78651A9217 for ; Wed, 13 Jan 2021 14:33:46 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id E1E1684D5B; Wed, 13 Jan 2021 14:33:45 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 25E5784D53 for ; Wed, 13 Jan 2021 14:33:45 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id jTT5EZUyqIc9 for ; Wed, 13 Jan 2021 14:33:44 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 967A484D32 for ; Wed, 13 Jan 2021 14:33:44 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 8B70FFA9D; Wed, 13 Jan 2021 14:33:44 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_161054842448080" MIME-Version: 1.0 Date: Wed, 13 Jan 2021 14:33:44 +0000 From: "Takahiro Kambe" Subject: CVS commit: pkgsrc/devel/ruby-racc To: pkgsrc-changes@NetBSD.org Reply-To: taca@netbsd.org X-Mailer: log_accum Message-Id: <20210113143344.8B70FFA9D@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_161054842448080 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: taca Date: Wed Jan 13 14:33:44 UTC 2021 Modified Files: pkgsrc/devel/ruby-racc: Makefile PLIST Log Message: devel/ruby-racc: fix conflict with ruby27-base Fix conflict with ruby27-base and add support for forthcoming ruby30. Bump PKGREVISION. To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 pkgsrc/devel/ruby-racc/Makefile cvs rdiff -u -r1.17 -r1.18 pkgsrc/devel/ruby-racc/PLIST Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_161054842448080 Content-Disposition: inline Content-Length: 1456 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/devel/ruby-racc/Makefile diff -u pkgsrc/devel/ruby-racc/Makefile:1.25 pkgsrc/devel/ruby-racc/Makefile:1.26 --- pkgsrc/devel/ruby-racc/Makefile:1.25 Sun Jan 10 15:51:47 2021 +++ pkgsrc/devel/ruby-racc/Makefile Wed Jan 13 14:33:44 2021 @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.25 2021/01/10 15:51:47 taca Exp $ +# $NetBSD: Makefile,v 1.26 2021/01/13 14:33:44 taca Exp $ DISTNAME= racc-1.5.2 +PKGREVISION= 1 CATEGORIES= devel MAINTAINER= taca@NetBSD.org @@ -10,5 +11,17 @@ LICENSE= gnu-lgpl-v2 RUBYGEM_OPTIONS+= --format-executable +PLIST_VARS+= racc_command + +.include "../../lang/ruby/rubyversion.mk" + +.if ${RUBY_VER} == "27" || ${RUBY_VER} == "30 +ALTERNATIVES_SRC= # empty +post-install: + ${RM} -f ${DESTDIR}${PREFIX}/bin/racc${RUBY_SUFFIX} +.else +PLIST.racc_command= yes +.endif + .include "../../lang/ruby/gem.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/devel/ruby-racc/PLIST diff -u pkgsrc/devel/ruby-racc/PLIST:1.17 pkgsrc/devel/ruby-racc/PLIST:1.18 --- pkgsrc/devel/ruby-racc/PLIST:1.17 Mon Apr 27 06:53:18 2020 +++ pkgsrc/devel/ruby-racc/PLIST Wed Jan 13 14:33:44 2021 @@ -1,5 +1,5 @@ -@comment $NetBSD: PLIST,v 1.17 2020/04/27 06:53:18 taca Exp $ -bin/racc${RUBY_SUFFIX} +@comment $NetBSD: PLIST,v 1.18 2021/01/13 14:33:44 taca Exp $ +${PLIST.racc_command}bin/racc${RUBY_SUFFIX} ${GEM_HOME}/cache/${GEM_NAME}.gem ${GEM_EXTSDIR}/gem.build_complete ${GEM_EXTSDIR}/racc/cparse.${RUBY_DLEXT} --_----------=_161054842448080--