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

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


(taca)
diff -r1.11 -r1.12 pkgsrc/lang/ruby26-base/Makefile
diff -r1.3 -r1.4 pkgsrc/lang/ruby26-base/hacks.mk
cvs diff -r1.11 -r1.12 pkgsrc/lang/ruby26-base/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/ruby26-base/Attic/Makefile 2020/10/04 03:41:12 1.11
+++ pkgsrc/lang/ruby26-base/Attic/Makefile 2021/02/14 15:31:02 1.12
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.11 2020/10/04 03:41:12 taca Exp $ 1# $NetBSD: Makefile,v 1.12 2021/02/14 15:31:02 taca Exp $
2 2
3DISTNAME= ${RUBY_DISTNAME} 3DISTNAME= ${RUBY_DISTNAME}
4PKGNAME= ${RUBY_PKGPREFIX}-base-${RUBY_VERSION} 4PKGNAME= ${RUBY_PKGPREFIX}-base-${RUBY_VERSION}
5PKGREVISION= 1 5PKGREVISION= 1
6CATEGORIES= lang ruby 6CATEGORIES= lang ruby
7MASTER_SITES= ${MASTER_SITE_RUBY} 7MASTER_SITES= ${MASTER_SITE_RUBY}
8 8
9MAINTAINER= taca@NetBSD.org 9MAINTAINER= taca@NetBSD.org
10HOMEPAGE= ${RUBY_HOMEPAGE} 10HOMEPAGE= ${RUBY_HOMEPAGE}
11COMMENT= Ruby ${RUBY_VERSION} release minimum base package 11COMMENT= Ruby ${RUBY_VERSION} release minimum base package
12 12
13RUBY_VERSIONS_ACCEPTED= 26 13RUBY_VERSIONS_ACCEPTED= 26
14 14
@@ -47,28 +47,27 @@ DOCS= BSDL COPYING COPYING.ja ChangeLog @@ -47,28 +47,27 @@ DOCS= BSDL COPYING COPYING.ja ChangeLog
47 doc/regexp.rdoc doc/security.rdoc doc/shell.rd.ja \ 47 doc/regexp.rdoc doc/security.rdoc doc/shell.rd.ja \
48 doc/standard_library.rdoc doc/syntax/assignment.rdoc \ 48 doc/standard_library.rdoc doc/syntax/assignment.rdoc \
49 doc/syntax/calling_methods.rdoc doc/syntax/control_expressions.rdoc \ 49 doc/syntax/calling_methods.rdoc doc/syntax/control_expressions.rdoc \
50 doc/syntax/exceptions.rdoc doc/syntax/literals.rdoc \ 50 doc/syntax/exceptions.rdoc doc/syntax/literals.rdoc \
51 doc/syntax/methods.rdoc doc/syntax/miscellaneous.rdoc \ 51 doc/syntax/methods.rdoc doc/syntax/miscellaneous.rdoc \
52 doc/syntax/modules_and_classes.rdoc doc/syntax/precedence.rdoc \ 52 doc/syntax/modules_and_classes.rdoc doc/syntax/precedence.rdoc \
53 doc/syntax/refinements.rdoc doc/syntax.rdoc 53 doc/syntax/refinements.rdoc doc/syntax.rdoc
54EXT_DOCS= syslog/syslog.txt 54EXT_DOCS= syslog/syslog.txt
55 55
56BIGDECIMAL_EXAMPLES= linear.rb nlsolve.rb pi.rb 56BIGDECIMAL_EXAMPLES= linear.rb nlsolve.rb pi.rb
57OPENSSL_EXAMPLES= c_rehash.rb cert2text.rb certstore.rb cipher.rb \ 57OPENSSL_EXAMPLES= c_rehash.rb cert2text.rb certstore.rb cipher.rb \
58 crlstore.rb echo_cli.rb echo_svr.rb gen_csr.rb \ 58 crlstore.rb echo_cli.rb echo_svr.rb gen_csr.rb \
59 smime_read.rb smime_write.rb wget.rb 59 smime_read.rb smime_write.rb wget.rb
60REPLACE_RUBY= bin/bundle bin/bundler bin/erb bin/gem bin/irb \ 60REPLACE_RUBY= libexec/bundle libexec/bundle_ruby \
61 bin/rdoc bin/ri libexec/bundle libexec/bundle_ruby \ 
62 libexec/bundler libexec/irb libexec/rdoc libexec/ri \ 61 libexec/bundler libexec/irb libexec/rdoc libexec/ri \
63 gems/rake-${RUBY_RAKE_VERSION}/exe/rake \ 62 gems/rake-${RUBY_RAKE_VERSION}/exe/rake \
64 gems/net-telnet-${RUBY_NET_TELNET_VERSION}/bin/console \ 63 gems/net-telnet-${RUBY_NET_TELNET_VERSION}/bin/console \
65 gems/net-telnet-${RUBY_NET_TELNET_VERSION}/bin/setup 64 gems/net-telnet-${RUBY_NET_TELNET_VERSION}/bin/setup
66REPLACE_RUBY_DIRS= ext lib sample 65REPLACE_RUBY_DIRS= ext lib sample
67INSTALLATION_DIRS= bin libexec ${PKGMANDIR}/man1 ${RUBY_DOC}/images \ 66INSTALLATION_DIRS= bin libexec ${PKGMANDIR}/man1 ${RUBY_DOC}/images \
68 ${RUBY_DOC}/irb ${RUBY_DOC}/pty ${RUBY_DOC}/ripper \ 67 ${RUBY_DOC}/irb ${RUBY_DOC}/pty ${RUBY_DOC}/ripper \
69 ${RUBY_DOC}/stringio ${RUBY_DOC}/syntax \ 68 ${RUBY_DOC}/stringio ${RUBY_DOC}/syntax \
70 ${RUBY_EG}/bigdecimal ${RUBY_EG}/pty 69 ${RUBY_EG}/bigdecimal ${RUBY_EG}/pty
71# ${RUBY_ARCHINC} ${RUBY_ARCHLIB} 70# ${RUBY_ARCHINC} ${RUBY_ARCHLIB}
72EMPTY_DIRS= generator/template markup/simple_markup 71EMPTY_DIRS= generator/template markup/simple_markup
73 72
74NOT_PAX_MPROTECT_SAFE+= bin/${RUBY_NAME} 73NOT_PAX_MPROTECT_SAFE+= bin/${RUBY_NAME}
cvs diff -r1.3 -r1.4 pkgsrc/lang/ruby26-base/Attic/hacks.mk (expand / switch to unified diff)

--- pkgsrc/lang/ruby26-base/Attic/hacks.mk 2019/12/07 07:18:52 1.3
+++ pkgsrc/lang/ruby26-base/Attic/hacks.mk 2021/02/14 15:31:02 1.4
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: hacks.mk,v 1.3 2019/12/07 07:18:52 mrg Exp $ 1# $NetBSD: hacks.mk,v 1.4 2021/02/14 15:31:02 taca Exp $
2 2
3.if !defined(RUBY24_BASE_HACKS_MK) 3.if !defined(RUBY26_BASE_HACKS_MK)
4RUBY24_BASE_HACKS_MK= defined 4RUBY26_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 # RUBY26_BASE_HACKS_MK