pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/lang/ruby25-base lang/ruby25-base: trivial fixes



details:   https://anonhg.NetBSD.org/pkgsrc/rev/19613646dfc6
branches:  trunk
changeset: 446951:19613646dfc6
user:      taca <taca%pkgsrc.org@localhost>
date:      Sun Feb 14 15:30:19 2021 +0000

description:
lang/ruby25-base: trivial fixes

* Do not REPLACE_RUBY for nonexistent files.
* Fix include guard for hack.mk.

diffstat:

 lang/ruby25-base/Makefile |  5 ++---
 lang/ruby25-base/hacks.mk |  8 ++++----
 2 files changed, 6 insertions(+), 7 deletions(-)

diffs (39 lines):

diff -r 6f4c1d956f5e -r 19613646dfc6 lang/ruby25-base/Makefile
--- a/lang/ruby25-base/Makefile Sun Feb 14 15:27:51 2021 +0000
+++ b/lang/ruby25-base/Makefile Sun Feb 14 15:30:19 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2020/10/04 03:45:26 taca Exp $
+# $NetBSD: Makefile,v 1.18 2021/02/14 15:30:19 taca Exp $
 
 DISTNAME=      ${RUBY_DISTNAME}
 PKGNAME=       ${RUBY_PKGPREFIX}-base-${RUBY_VERSION}
@@ -56,8 +56,7 @@
 OPENSSL_EXAMPLES=      c_rehash.rb cert2text.rb certstore.rb cipher.rb \
                        crlstore.rb echo_cli.rb echo_svr.rb gen_csr.rb \
                        smime_read.rb smime_write.rb wget.rb
-REPLACE_RUBY=          bin/erb bin/gem bin/irb bin/rdoc bin/ri \
-                       gems/rake-${RUBY_RAKE_VERSION}/exe/rake \
+REPLACE_RUBY=          gems/rake-${RUBY_RAKE_VERSION}/exe/rake \
                        gems/net-telnet-${RUBY_NET_TELNET_VERSION}/bin/console \
                        gems/net-telnet-${RUBY_NET_TELNET_VERSION}/bin/setup
 REPLACE_RUBY_DIRS=     ext lib sample
diff -r 6f4c1d956f5e -r 19613646dfc6 lang/ruby25-base/hacks.mk
--- a/lang/ruby25-base/hacks.mk Sun Feb 14 15:27:51 2021 +0000
+++ b/lang/ruby25-base/hacks.mk Sun Feb 14 15:30:19 2021 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: hacks.mk,v 1.4 2019/12/07 07:18:52 mrg Exp $
+# $NetBSD: hacks.mk,v 1.5 2021/02/14 15:30:19 taca Exp $
 
-.if !defined(RUBY24_BASE_HACKS_MK)
-RUBY24_BASE_HACKS_MK=  defined
+.if !defined(RUBY25_BASE_HACKS_MK)
+RUBY25_BASE_HACKS_MK=  defined
 
 .include "../../mk/compiler.mk"
 
@@ -41,4 +41,4 @@
 BUILDLINK_TRANSFORM+=  rm:-fomit-frame-pointer
 .endif
 
-.endif # RUBY24_BASE_HACKS_MK
+.endif # RUBY25_BASE_HACKS_MK



Home | Main Index | Thread Index | Old Index