Sun Feb 14 15:30:19 2021 UTC ()
lang/ruby25-base: trivial fixes

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


(taca)
diff -r1.17 -r1.18 pkgsrc/lang/ruby25-base/Makefile
diff -r1.4 -r1.5 pkgsrc/lang/ruby25-base/hacks.mk
cvs diff -r1.17 -r1.18 pkgsrc/lang/ruby25-base/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/ruby25-base/Attic/Makefile 2020/10/04 03:45:26 1.17
+++ pkgsrc/lang/ruby25-base/Attic/Makefile 2021/02/14 15:30:19 1.18
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.17 2020/10/04 03:45:26 taca Exp $ 1# $NetBSD: Makefile,v 1.18 2021/02/14 15:30:19 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= 25 13RUBY_VERSIONS_ACCEPTED= 25
14 14
@@ -46,28 +46,27 @@ DOCS= BSDL COPYING COPYING.ja ChangeLog @@ -46,28 +46,27 @@ DOCS= BSDL COPYING COPYING.ja ChangeLog
46 doc/regexp.rdoc doc/security.rdoc doc/shell.rd.ja \ 46 doc/regexp.rdoc doc/security.rdoc doc/shell.rd.ja \
47 doc/standard_library.rdoc doc/syntax/assignment.rdoc \ 47 doc/standard_library.rdoc doc/syntax/assignment.rdoc \
48 doc/syntax/calling_methods.rdoc doc/syntax/control_expressions.rdoc \ 48 doc/syntax/calling_methods.rdoc doc/syntax/control_expressions.rdoc \
49 doc/syntax/exceptions.rdoc doc/syntax/literals.rdoc \ 49 doc/syntax/exceptions.rdoc doc/syntax/literals.rdoc \
50 doc/syntax/methods.rdoc doc/syntax/miscellaneous.rdoc \ 50 doc/syntax/methods.rdoc doc/syntax/miscellaneous.rdoc \
51 doc/syntax/modules_and_classes.rdoc doc/syntax/precedence.rdoc \ 51 doc/syntax/modules_and_classes.rdoc doc/syntax/precedence.rdoc \
52 doc/syntax/refinements.rdoc doc/syntax.rdoc 52 doc/syntax/refinements.rdoc doc/syntax.rdoc
53EXT_DOCS= syslog/syslog.txt 53EXT_DOCS= syslog/syslog.txt
54 54
55BIGDECIMAL_EXAMPLES= linear.rb nlsolve.rb pi.rb 55BIGDECIMAL_EXAMPLES= linear.rb nlsolve.rb pi.rb
56OPENSSL_EXAMPLES= c_rehash.rb cert2text.rb certstore.rb cipher.rb \ 56OPENSSL_EXAMPLES= c_rehash.rb cert2text.rb certstore.rb cipher.rb \
57 crlstore.rb echo_cli.rb echo_svr.rb gen_csr.rb \ 57 crlstore.rb echo_cli.rb echo_svr.rb gen_csr.rb \
58 smime_read.rb smime_write.rb wget.rb 58 smime_read.rb smime_write.rb wget.rb
59REPLACE_RUBY= bin/erb bin/gem bin/irb bin/rdoc bin/ri \ 59REPLACE_RUBY= gems/rake-${RUBY_RAKE_VERSION}/exe/rake \
60 gems/rake-${RUBY_RAKE_VERSION}/exe/rake \ 
61 gems/net-telnet-${RUBY_NET_TELNET_VERSION}/bin/console \ 60 gems/net-telnet-${RUBY_NET_TELNET_VERSION}/bin/console \
62 gems/net-telnet-${RUBY_NET_TELNET_VERSION}/bin/setup 61 gems/net-telnet-${RUBY_NET_TELNET_VERSION}/bin/setup
63REPLACE_RUBY_DIRS= ext lib sample 62REPLACE_RUBY_DIRS= ext lib sample
64INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 ${RUBY_DOC}/images \ 63INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 ${RUBY_DOC}/images \
65 ${RUBY_DOC}/irb ${RUBY_DOC}/pty ${RUBY_DOC}/ripper \ 64 ${RUBY_DOC}/irb ${RUBY_DOC}/pty ${RUBY_DOC}/ripper \
66 ${RUBY_DOC}/stringio ${RUBY_DOC}/syntax \ 65 ${RUBY_DOC}/stringio ${RUBY_DOC}/syntax \
67 ${RUBY_EG}/bigdecimal ${RUBY_EG}/pty 66 ${RUBY_EG}/bigdecimal ${RUBY_EG}/pty
68# ${RUBY_ARCHINC} ${RUBY_ARCHLIB} 67# ${RUBY_ARCHINC} ${RUBY_ARCHLIB}
69EMPTY_DIRS= generator/template markup/simple_markup 68EMPTY_DIRS= generator/template markup/simple_markup
70 69
71NOT_PAX_MPROTECT_SAFE+= bin/${RUBY_NAME} 70NOT_PAX_MPROTECT_SAFE+= bin/${RUBY_NAME}
72 71
73pre-configure: 72pre-configure:
cvs diff -r1.4 -r1.5 pkgsrc/lang/ruby25-base/Attic/hacks.mk (expand / switch to unified diff)

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