CVS commit: pkgsrc/lang/ruby25-base

["Takahiro Kambe" <taca%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   taca
Date:           Sun Feb 14 15:30:19 UTC 2021

Modified Files:
        pkgsrc/lang/ruby25-base: Makefile hacks.mk

Log Message:
lang/ruby25-base: trivial fixes

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


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 pkgsrc/lang/ruby25-base/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/lang/ruby25-base/hacks.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/ruby25-base/Makefile
diff -u pkgsrc/lang/ruby25-base/Makefile:1.17 pkgsrc/lang/ruby25-base/Makefile:1.18
--- pkgsrc/lang/ruby25-base/Makefile:1.17       Sun Oct  4 03:45:26 2020
+++ pkgsrc/lang/ruby25-base/Makefile    Sun Feb 14 15:30:19 2021
@@ -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 @@ BIGDECIMAL_EXAMPLES=  linear.rb nlsolve.r
 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

Index: pkgsrc/lang/ruby25-base/hacks.mk
diff -u pkgsrc/lang/ruby25-base/hacks.mk:1.4 pkgsrc/lang/ruby25-base/hacks.mk:1.5
--- pkgsrc/lang/ruby25-base/hacks.mk:1.4        Sat Dec  7 07:18:52 2019
+++ pkgsrc/lang/ruby25-base/hacks.mk    Sun Feb 14 15:30:19 2021
@@ -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 @@ PKG_HACKS+=           optimisation
 BUILDLINK_TRANSFORM+=  rm:-fomit-frame-pointer
 .endif
 
-.endif # RUBY24_BASE_HACKS_MK
+.endif # RUBY25_BASE_HACKS_MK