pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/devel/ruby-racc devel/ruby-racc: fix conflict with rub...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/039022949da8
branches:  trunk
changeset: 444835:039022949da8
user:      taca <taca%pkgsrc.org@localhost>
date:      Wed Jan 13 14:33:44 2021 +0000

description:
devel/ruby-racc: fix conflict with ruby27-base

Fix conflict with ruby27-base and add support for forthcoming ruby30.

Bump PKGREVISION.

diffstat:

 devel/ruby-racc/Makefile |  15 ++++++++++++++-
 devel/ruby-racc/PLIST    |   4 ++--
 2 files changed, 16 insertions(+), 3 deletions(-)

diffs (41 lines):

diff -r 3c81b3dade62 -r 039022949da8 devel/ruby-racc/Makefile
--- a/devel/ruby-racc/Makefile  Wed Jan 13 14:30:39 2021 +0000
+++ b/devel/ruby-racc/Makefile  Wed Jan 13 14:33:44 2021 +0000
@@ -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@localhost
@@ -10,5 +11,17 @@
 
 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"
diff -r 3c81b3dade62 -r 039022949da8 devel/ruby-racc/PLIST
--- a/devel/ruby-racc/PLIST     Wed Jan 13 14:30:39 2021 +0000
+++ b/devel/ruby-racc/PLIST     Wed Jan 13 14:33:44 2021 +0000
@@ -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}



Home | Main Index | Thread Index | Old Index