Sun Feb 14 15:31:23 2021 UTC ()
lang/ruby27-base: trivial fixes

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


(taca)
diff -r1.5 -r1.6 pkgsrc/lang/ruby27-base/Makefile
diff -r1.1 -r1.2 pkgsrc/lang/ruby27-base/hacks.mk
cvs diff -r1.5 -r1.6 pkgsrc/lang/ruby27-base/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/ruby27-base/Attic/Makefile 2020/10/04 03:29:25 1.5
+++ pkgsrc/lang/ruby27-base/Attic/Makefile 2021/02/14 15:31:23 1.6
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.5 2020/10/04 03:29:25 taca Exp $ 1# $NetBSD: Makefile,v 1.6 2021/02/14 15:31:23 taca Exp $
2 2
3DISTNAME= ${RUBY_DISTNAME} 3DISTNAME= ${RUBY_DISTNAME}
4PKGNAME= ${RUBY_PKGPREFIX}-base-${RUBY_VERSION} 4PKGNAME= ${RUBY_PKGPREFIX}-base-${RUBY_VERSION}
5CATEGORIES= lang ruby 5CATEGORIES= lang ruby
6MASTER_SITES= ${MASTER_SITE_RUBY} 6MASTER_SITES= ${MASTER_SITE_RUBY}
7 7
8MAINTAINER= taca@NetBSD.org 8MAINTAINER= taca@NetBSD.org
9HOMEPAGE= ${RUBY_HOMEPAGE} 9HOMEPAGE= ${RUBY_HOMEPAGE}
10COMMENT= Ruby ${RUBY_VERSION} release minimum base package 10COMMENT= Ruby ${RUBY_VERSION} release minimum base package
11 11
12RUBY_VERSIONS_ACCEPTED= 27 12RUBY_VERSIONS_ACCEPTED= 27
13 13
14MAKE_JOBS_SAFE= no 14MAKE_JOBS_SAFE= no
@@ -49,29 +49,27 @@ DOCS= BSDL COPYING COPYING.ja ChangeLog @@ -49,29 +49,27 @@ DOCS= BSDL COPYING COPYING.ja ChangeLog
49 doc/standard_library.rdoc doc/syntax/assignment.rdoc \ 49 doc/standard_library.rdoc doc/syntax/assignment.rdoc \
50 doc/syntax/calling_methods.rdoc doc/syntax/comments.rdoc \ 50 doc/syntax/calling_methods.rdoc doc/syntax/comments.rdoc \
51 doc/syntax/control_expressions.rdoc \ 51 doc/syntax/control_expressions.rdoc \
52 doc/syntax/exceptions.rdoc doc/syntax/literals.rdoc \ 52 doc/syntax/exceptions.rdoc doc/syntax/literals.rdoc \
53 doc/syntax/methods.rdoc doc/syntax/miscellaneous.rdoc \ 53 doc/syntax/methods.rdoc doc/syntax/miscellaneous.rdoc \
54 doc/syntax/modules_and_classes.rdoc \ 54 doc/syntax/modules_and_classes.rdoc \
55 doc/syntax/precedence.rdoc doc/syntax/refinements.rdoc 55 doc/syntax/precedence.rdoc doc/syntax/refinements.rdoc
56EXT_DOCS= syslog/syslog.txt 56EXT_DOCS= syslog/syslog.txt
57 57
58BIGDECIMAL_EXAMPLES= linear.rb nlsolve.rb pi.rb 58BIGDECIMAL_EXAMPLES= linear.rb nlsolve.rb pi.rb
59OPENSSL_EXAMPLES= c_rehash.rb cert2text.rb certstore.rb cipher.rb \ 59OPENSSL_EXAMPLES= c_rehash.rb cert2text.rb certstore.rb cipher.rb \
60 crlstore.rb echo_cli.rb echo_svr.rb gen_csr.rb \ 60 crlstore.rb echo_cli.rb echo_svr.rb gen_csr.rb \
61 smime_read.rb smime_write.rb wget.rb 61 smime_read.rb smime_write.rb wget.rb
62REPLACE_RUBY= bin/bundle bin/bundler bin/erb bin/gem bin/irb \ 62REPLACE_RUBY= libexec/bundle libexec/bundler libexec/irb \
63 bin/racc bin/racc2y bin/rdoc bin/ri bin/y2racc \ 
64 libexec/bundle libexec/bundler libexec/irb \ 
65 libexec/racc libexec/racc2y libexec/rdoc libexec/ri \ 63 libexec/racc libexec/racc2y libexec/rdoc libexec/ri \
66 libexec/y2racc \ 64 libexec/y2racc \
67 gems/net-telnet-${RUBY_NET_TELNET_VERSION}/bin/console \ 65 gems/net-telnet-${RUBY_NET_TELNET_VERSION}/bin/console \
68 gems/power_assert-${RUBY_POWER_ASSERT_VERSION}/bin/console \ 66 gems/power_assert-${RUBY_POWER_ASSERT_VERSION}/bin/console \
69 gems/rake-${RUBY_RAKE_VERSION}/bin/bundle \ 67 gems/rake-${RUBY_RAKE_VERSION}/bin/bundle \
70 gems/rake-${RUBY_RAKE_VERSION}/bin/console \ 68 gems/rake-${RUBY_RAKE_VERSION}/bin/console \
71 gems/rake-${RUBY_RAKE_VERSION}/bin/rake \ 69 gems/rake-${RUBY_RAKE_VERSION}/bin/rake \
72 gems/rake-${RUBY_RAKE_VERSION}/bin/rdoc \ 70 gems/rake-${RUBY_RAKE_VERSION}/bin/rdoc \
73 gems/rake-${RUBY_RAKE_VERSION}/bin/rubocop \ 71 gems/rake-${RUBY_RAKE_VERSION}/bin/rubocop \
74 gems/rake-${RUBY_RAKE_VERSION}/bin/setup \ 72 gems/rake-${RUBY_RAKE_VERSION}/bin/setup \
75 gems/rake-${RUBY_RAKE_VERSION}/exe/rake \ 73 gems/rake-${RUBY_RAKE_VERSION}/exe/rake \
76 gems/xmlrpc-0.3.0/bin/console 74 gems/xmlrpc-0.3.0/bin/console
77REPLACE_RUBY_DIRS= ext lib sample 75REPLACE_RUBY_DIRS= ext lib sample
cvs diff -r1.1 -r1.2 pkgsrc/lang/ruby27-base/Attic/hacks.mk (expand / switch to unified diff)

--- pkgsrc/lang/ruby27-base/Attic/hacks.mk 2020/03/15 15:26:22 1.1
+++ pkgsrc/lang/ruby27-base/Attic/hacks.mk 2021/02/14 15:31:23 1.2
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: hacks.mk,v 1.1 2020/03/15 15:26:22 taca Exp $ 1# $NetBSD: hacks.mk,v 1.2 2021/02/14 15:31:23 taca Exp $
2 2
3.if !defined(RUBY24_BASE_HACKS_MK) 3.if !defined(RUBY27_BASE_HACKS_MK)
4RUBY24_BASE_HACKS_MK= defined 4RUBY27_BASE_HACKS_MK= defined
5 5
6.include "../../mk/compiler.mk" 6.include "../../mk/compiler.mk"
7 7
8### [ Sun Jun 5 10:05:39 CEST 2005 : seb ] 8### [ Sun Jun 5 10:05:39 CEST 2005 : seb ]
9### On NetBSD/sparc64, gcc optimisation, at least for version 3.3.3, 9### On NetBSD/sparc64, gcc optimisation, at least for version 3.3.3,
10### produces segmentation faulting miniruby binary. 10### produces segmentation faulting miniruby binary.
11### Also note that `-O' level optimisation produces a miniruby 11### Also note that `-O' level optimisation produces a miniruby
12### binary that loops while running the installation scripts. 12### binary that loops while running the installation scripts.
13### 13###
14.if !empty(MACHINE_PLATFORM:MNetBSD-*-sparc64) 14.if !empty(MACHINE_PLATFORM:MNetBSD-*-sparc64)
15. if !empty(CC_VERSION:Mgcc-3.3.*) 15. if !empty(CC_VERSION:Mgcc-3.3.*)
16PKG_HACKS+= optimisation 16PKG_HACKS+= optimisation
17BUILDLINK_TRANSFORM+= rm:-O[0-9]* 17BUILDLINK_TRANSFORM+= rm:-O[0-9]*
@@ -31,14 +31,14 @@ BUILDLINK_TRANSFORM+= opt:-O2:-O1 @@ -31,14 +31,14 @@ BUILDLINK_TRANSFORM+= opt:-O2:-O1
31# and -O1 works around. 31# and -O1 works around.
32.if !empty(MACHINE_PLATFORM:MNetBSD-*-sh3*) && !empty(CC_VERSION:Mgcc-4.5.*) 32.if !empty(MACHINE_PLATFORM:MNetBSD-*-sh3*) && !empty(CC_VERSION:Mgcc-4.5.*)
33PKG_HACKS+= optimisation 33PKG_HACKS+= optimisation
34BUILDLINK_TRANSFORM+= opt:-Os:-O1 rm:-freorder-blocks 34BUILDLINK_TRANSFORM+= opt:-Os:-O1 rm:-freorder-blocks
35.endif 35.endif
36 36
37# On NetBSD/aarch64, gcc optimisation produces segmentation faulting 37# On NetBSD/aarch64, gcc optimisation produces segmentation faulting
38# miniruby binary. 38# miniruby binary.
39.if !empty(MACHINE_PLATFORM:MNetBSD-*-aarch64) && !empty(CC_VERSION:Mgcc-*) 39.if !empty(MACHINE_PLATFORM:MNetBSD-*-aarch64) && !empty(CC_VERSION:Mgcc-*)
40PKG_HACKS+= optimisation 40PKG_HACKS+= optimisation
41BUILDLINK_TRANSFORM+= rm:-fomit-frame-pointer 41BUILDLINK_TRANSFORM+= rm:-fomit-frame-pointer
42.endif 42.endif
43 43
44.endif # RUBY24_BASE_HACKS_MK 44.endif # RUBY27_BASE_HACKS_MK