Mon Jun 1 01:46:36 2015 UTC ()
Pullup ticket #4721 - requested by taca
lang/ruby21-base: build fix

Revisions pulled up:
- pkgsrc/lang/ruby21-base/Makefile                              1.12
- pkgsrc/lang/ruby21-base/distinfo                              1.17
- pkgsrc/lang/ruby21-base/patches/patch-configure               1.4
- pkgsrc/lang/ruby21-base/patches/patch-lib_mkmf.rb             1.1

---
   Module Name:    pkgsrc
   Committed By:   sevan
   Date:           Wed Apr 22 19:04:56 UTC 2015

   Modified Files:
           pkgsrc/lang/ruby21-base: distinfo
           pkgsrc/lang/ruby21-base/patches: patch-configure

   Log Message:
   Remove mention of MirBSD in patch description as support is there by default now

   Reviewed by wiz@

---
   Module Name:    pkgsrc
   Committed By:   taca
   Date:           Thu Apr 30 03:27:20 UTC 2015

   Modified Files:
           pkgsrc/lang/ruby21-base: Makefile distinfo
   Added Files:
           pkgsrc/lang/ruby21-base/patches: patch-lib_mkmf.rb

   Log Message:
   Avoid to generate empty command line on some platforms:

   $(DLLIB): $(OBJS) Makefile
   ...
           $(Q) $(POSTLINK)

   And POSTLINK is empty macro.  In such case, GNU make ignore empty command
   line but BSD make tries to execute it and causes error.

   Bump PKGREVISION.


(hiramatsu)
diff -r1.11 -r1.11.2.1 pkgsrc/lang/ruby21-base/Makefile
diff -r1.13.2.1 -r1.13.2.2 pkgsrc/lang/ruby21-base/distinfo
diff -r1.2.8.1 -r1.2.8.2 pkgsrc/lang/ruby21-base/patches/patch-configure
diff -r0 -r1.1.2.2 pkgsrc/lang/ruby21-base/patches/patch-lib_mkmf.rb
cvs diff -r1.11 -r1.11.2.1 pkgsrc/lang/ruby21-base/Attic/Makefile (switch to unified diff)

--- pkgsrc/lang/ruby21-base/Attic/Makefile 2015/03/08 15:52:51 1.11
+++ pkgsrc/lang/ruby21-base/Attic/Makefile 2015/06/01 01:46:36 1.11.2.1
@@ -1,187 +1,188 @@ @@ -1,187 +1,188 @@
1# $NetBSD: Makefile,v 1.11 2015/03/08 15:52:51 taca Exp $ 1# $NetBSD: Makefile,v 1.11.2.1 2015/06/01 01:46:36 hiramatsu Exp $
2# 2#
3 3
4DISTNAME= ${RUBY_DISTNAME} 4DISTNAME= ${RUBY_DISTNAME}
5PKGNAME= ${RUBY_PKGPREFIX}-base-${RUBY_VERSION_FULL} 5PKGNAME= ${RUBY_PKGPREFIX}-base-${RUBY_VERSION_FULL}
 6PKGREVISION= 1
6CATEGORIES= lang ruby 7CATEGORIES= lang ruby
7MASTER_SITES= ${MASTER_SITE_RUBY} 8MASTER_SITES= ${MASTER_SITE_RUBY}
8 9
9MAINTAINER= taca@NetBSD.org 10MAINTAINER= taca@NetBSD.org
10HOMEPAGE= ${RUBY_HOMEPAGE} 11HOMEPAGE= ${RUBY_HOMEPAGE}
11COMMENT= Ruby ${RUBY_VERSION} release minimum base package 12COMMENT= Ruby ${RUBY_VERSION} release minimum base package
12LICENSE= ${RUBY_LICENSE} 13LICENSE= ${RUBY_LICENSE}
13 14
14RUBY_VERSION_SUPPORTED= 21 15RUBY_VERSION_SUPPORTED= 21
15 16
16USE_LANGUAGES= c 17USE_LANGUAGES= c
17USE_TOOLS+= pax yacc 18USE_TOOLS+= pax yacc
18GNU_CONFIGURE= yes 19GNU_CONFIGURE= yes
19TEST_TARGET= test 20TEST_TARGET= test
20CONFIGURE_ARGS+= --enable-shared 21CONFIGURE_ARGS+= --enable-shared
21WRKSRC= ${RUBY_WRKSRC} 22WRKSRC= ${RUBY_WRKSRC}
22 23
23MAKE_DIRS= ${RUBY_SITEARCHLIB} ${RUBY_VENDORARCHLIB} 24MAKE_DIRS= ${RUBY_SITEARCHLIB} ${RUBY_VENDORARCHLIB}
24 25
25# 26#
26# Don't refrect pkgsrc's INSTALL macro since Ruby expect it could 27# Don't refrect pkgsrc's INSTALL macro since Ruby expect it could
27# execute by unprivileged user. 28# execute by unprivileged user.
28# 29#
29CONFIGURE_ENV+= INSTALL="${INSTALL} ${COPY}" \ 30CONFIGURE_ENV+= INSTALL="${INSTALL} ${COPY}" \
30 INSTALL_DATA= INSTALL_PROGRAM= INSTALL_SCRIPT= 31 INSTALL_DATA= INSTALL_PROGRAM= INSTALL_SCRIPT=
31 32
32.include "../../mk/compiler.mk" 33.include "../../mk/compiler.mk"
33 34
34.if !empty(PKGSRC_COMPILER:Msunpro) 35.if !empty(PKGSRC_COMPILER:Msunpro)
35LIBS.SunOS+= -B static -lsunmath -B dynamic -lm 36LIBS.SunOS+= -B static -lsunmath -B dynamic -lm
36LDFLAGS.SunOS+= -L${SUNWSPROBASE}/lib -Wl,-R${SUNWSPROBASE}/lib 37LDFLAGS.SunOS+= -L${SUNWSPROBASE}/lib -Wl,-R${SUNWSPROBASE}/lib
37CONFIGURE_ENV+= LDSHARED="${CC} -G" 38CONFIGURE_ENV+= LDSHARED="${CC} -G"
38.else 39.else
39LIBS.SunOS+= -lm 40LIBS.SunOS+= -lm
40.endif 41.endif
41 42
42.if ${OPSYS} == "SunOS" 43.if ${OPSYS} == "SunOS"
43CONFIGURE_ENV+= OBJCOPY=: 44CONFIGURE_ENV+= OBJCOPY=:
44CONFIGURE_ENV+= ac_cv_prog_PKG_CONFIG="" 45CONFIGURE_ENV+= ac_cv_prog_PKG_CONFIG=""
45.endif 46.endif
46 47
47.if ${OPSYS} == "MirBSD" 48.if ${OPSYS} == "MirBSD"
48# if present, an unsupported sysconf call is used 49# if present, an unsupported sysconf call is used
49CONFIGURE_ENV+= ac_cv_func_getgrnam_r=no 50CONFIGURE_ENV+= ac_cv_func_getgrnam_r=no
50.endif 51.endif
51 52
52# bmake doesn't like the codesign/POSTLINK constructs for Darwin. 53# bmake doesn't like the codesign/POSTLINK constructs for Darwin.
53.if ${OPSYS} == "Cygwin" || ${OPSYS} == "Darwin" 54.if ${OPSYS} == "Cygwin" || ${OPSYS} == "Darwin"
54USE_TOOLS+= gmake 55USE_TOOLS+= gmake
55MAKE_FILE= GNUmakefile 56MAKE_FILE= GNUmakefile
56.endif 57.endif
57 58
58# Ruby build process depends on config.status's content 59# Ruby build process depends on config.status's content
59CONFIG_STATUS_OVERRIDE= # empty 60CONFIG_STATUS_OVERRIDE= # empty
60 61
61MAKE_DIRS+= ${RUBY_SITERIDIR} 62MAKE_DIRS+= ${RUBY_SITERIDIR}
62FILES_SUBST+= DATE=${DATE:Q} 63FILES_SUBST+= DATE=${DATE:Q}
63 64
64REQD_DIRS+= ${GEM_HOME}/cache 65REQD_DIRS+= ${GEM_HOME}/cache
65REQD_DIRS+= ${GEM_HOME}/doc 66REQD_DIRS+= ${GEM_HOME}/doc
66 67
67SUBST_CLASSES+= conf 68SUBST_CLASSES+= conf
68SUBST_STAGE.conf= pre-install 69SUBST_STAGE.conf= pre-install
69SUBST_FILES.conf= lib/rubygems/config_file.rb 70SUBST_FILES.conf= lib/rubygems/config_file.rb
70SUBST_SED.conf= -e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g" 71SUBST_SED.conf= -e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g"
71SUBST_MESSAGE.conf= Fixing configuration files. 72SUBST_MESSAGE.conf= Fixing configuration files.
72 73
73.include "options.mk" 74.include "options.mk"
74 75
75.include "../../lang/ruby/rubyversion.mk" 76.include "../../lang/ruby/rubyversion.mk"
76 77
77.if !empty(RUBY_SUFFIX) 78.if !empty(RUBY_SUFFIX)
78CONFIGURE_ARGS+= --program-suffix=${RUBY_SUFFIX} 79CONFIGURE_ARGS+= --program-suffix=${RUBY_SUFFIX}
79CONFIGURE_ARGS+= --with-soname=${RUBY_NAME} 80CONFIGURE_ARGS+= --with-soname=${RUBY_NAME}
80CONFIGURE_ARGS+= --with-ruby-version=${RUBY_VER_DIR} 81CONFIGURE_ARGS+= --with-ruby-version=${RUBY_VER_DIR}
81CONFIGURE_ARGS+= --with-ruby-pc="ruby-${RUBY_VERSION}.pc" 82CONFIGURE_ARGS+= --with-ruby-pc="ruby-${RUBY_VERSION}.pc"
82.endif 83.endif
83 84
84# 85#
85# Ruby 2.0 don't like Apple's builtin OpenSSL. 86# Ruby 2.0 don't like Apple's builtin OpenSSL.
86# 87#
87.if ${OPSYS} == "Darwin" 88.if ${OPSYS} == "Darwin"
88USE_BUILTIN.openssl= no 89USE_BUILTIN.openssl= no
89.endif 90.endif
90 91
91# 92#
92# Win32 support (for Cygwin) 93# Win32 support (for Cygwin)
93# 94#
94PLIST_VARS+= win32 95PLIST_VARS+= win32
95.if ${OPSYS} == "Cygwin" 96.if ${OPSYS} == "Cygwin"
96PLIST.win32= yes 97PLIST.win32= yes
97.endif 98.endif
98 99
99# 100#
100# IRIX work around which should be fixed. 101# IRIX work around which should be fixed.
101# 102#
102PLIST_VARS+= io 103PLIST_VARS+= io
103.if ${OPSYS} != "IRIX" 104.if ${OPSYS} != "IRIX"
104PLIST.io= yes 105PLIST.io= yes
105.endif 106.endif
106 107
107# 108#
108# Work around for getucontext(3) 109# Work around for getucontext(3)
109# 110#
110.if ${OPSYS} == "DragonFly" && ${OS_VERSION} == "1.8.0" 111.if ${OPSYS} == "DragonFly" && ${OS_VERSION} == "1.8.0"
111CONFIGURE_ENV+= ac_cv_header_ucontext_h=no 112CONFIGURE_ENV+= ac_cv_header_ucontext_h=no
112.endif 113.endif
113 114
114# 115#
115# prevent unwanted mkdir recorded in rbconfig.rb 116# prevent unwanted mkdir recorded in rbconfig.rb
116# 117#
117CONFIGURE_ENV+= MKDIR_P=${MKDIR:Q} 118CONFIGURE_ENV+= MKDIR_P=${MKDIR:Q}
118 119
119DOCS= COPYING COPYING.ja ChangeLog NEWS README \ 120DOCS= COPYING COPYING.ja ChangeLog NEWS README \
120 README.EXT README.EXT.ja README.ja \ 121 README.EXT README.EXT.ja README.ja \
121 doc/ChangeLog-1.8.0 doc/ChangeLog-1.9.3 doc/ChangeLog-YARV \ 122 doc/ChangeLog-1.8.0 doc/ChangeLog-1.9.3 doc/ChangeLog-YARV \
122 doc/NEWS-1.8.7 doc/NEWS-1.9.1 doc/NEWS-1.9.2 doc/NEWS-1.9.3 \ 123 doc/NEWS-1.8.7 doc/NEWS-1.9.1 doc/NEWS-1.9.2 doc/NEWS-1.9.3 \
123 doc/etc.rd.ja doc/forwardable.rd.ja doc/globals.rdoc \ 124 doc/etc.rd.ja doc/forwardable.rd.ja doc/globals.rdoc \
124 doc/irb/irb-tools.rd.ja doc/irb/irb.rd.ja \ 125 doc/irb/irb-tools.rd.ja doc/irb/irb.rd.ja \
125 doc/pty/README.expect.ja doc/pty/README.ja doc/shell.rd.ja 126 doc/pty/README.expect.ja doc/pty/README.ja doc/shell.rd.ja
126EXT_DOCS= syslog/syslog.txt 127EXT_DOCS= syslog/syslog.txt
127 128
128BIGDECIMAL_EXAMPLES= linear.rb nlsolve.rb pi.rb 129BIGDECIMAL_EXAMPLES= linear.rb nlsolve.rb pi.rb
129OPENSSL_EXAMPLES= c_rehash.rb cert2text.rb certstore.rb cipher.rb \ 130OPENSSL_EXAMPLES= c_rehash.rb cert2text.rb certstore.rb cipher.rb \
130 crlstore.rb echo_cli.rb echo_svr.rb gen_csr.rb \ 131 crlstore.rb echo_cli.rb echo_svr.rb gen_csr.rb \
131 smime_read.rb smime_write.rb wget.rb 132 smime_read.rb smime_write.rb wget.rb
132 133
133REPLACE_RUBY= bin/erb bin/gem bin/irb bin/rake bin/rdoc \ 134REPLACE_RUBY= bin/erb bin/gem bin/irb bin/rake bin/rdoc \
134 bin/ri bin/testrb 135 bin/ri bin/testrb
135REPLACE_RUBY_DIRS= ext lib sample 136REPLACE_RUBY_DIRS= ext lib sample
136INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 \ 137INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 \
137 ${RUBY_DOC}/irb ${RUBY_DOC}/pty ${RUBY_DOC}/ripper \ 138 ${RUBY_DOC}/irb ${RUBY_DOC}/pty ${RUBY_DOC}/ripper \
138 ${RUBY_DOC}/stringio \ 139 ${RUBY_DOC}/stringio \
139 ${RUBY_EG}/bigdecimal ${RUBY_EG}/pty 140 ${RUBY_EG}/bigdecimal ${RUBY_EG}/pty
140# ${RUBY_ARCHINC} ${RUBY_ARCHLIB} 141# ${RUBY_ARCHINC} ${RUBY_ARCHLIB}
141EMPTY_DIRS= generator/template markup/simple_markup 142EMPTY_DIRS= generator/template markup/simple_markup
142 143
143post-extract: 144post-extract:
144 ${CP} ${FILESDIR}/AddTrustExternalCARoot-2048.pem \ 145 ${CP} ${FILESDIR}/AddTrustExternalCARoot-2048.pem \
145 ${WRKSRC}/lib/rubygems/ssl_certs 146 ${WRKSRC}/lib/rubygems/ssl_certs
146 147
147pre-configure: 148pre-configure:
148 ${RM} -f ${WRKSRC}/ext/gdbm/extconf.rb 149 ${RM} -f ${WRKSRC}/ext/gdbm/extconf.rb
149 ${RM} -f ${WRKSRC}/ext/fiddle/extconf.rb 150 ${RM} -f ${WRKSRC}/ext/fiddle/extconf.rb
150 ${RM} -f ${WRKSRC}/ext/readline/extconf.rb 151 ${RM} -f ${WRKSRC}/ext/readline/extconf.rb
151 ${RM} -f ${WRKSRC}/ext/tk/extconf.rb 152 ${RM} -f ${WRKSRC}/ext/tk/extconf.rb
152 153
153pre-install: 154pre-install:
154 cd ${WRKSRC}/lib; \ 155 cd ${WRKSRC}/lib; \
155 ${FIND} . \( -name '*.orig' -o -name '*.orig_dist' \) \ 156 ${FIND} . \( -name '*.orig' -o -name '*.orig_dist' \) \
156 -exec ${RM} -f {} \; 157 -exec ${RM} -f {} \;
157.for f in ${EMPTY_DIRS} 158.for f in ${EMPTY_DIRS}
158 ${RMDIR} ${WRKSRC}/lib/rdoc/${f} 2>/dev/null || ${TRUE} 159 ${RMDIR} ${WRKSRC}/lib/rdoc/${f} 2>/dev/null || ${TRUE}
159.endfor 160.endfor
160 161
161post-install: 162post-install:
162.for f in ${DOCS} 163.for f in ${DOCS}
163 ${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/${RUBY_DOC}/${f:C/^doc\///} 164 ${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/${RUBY_DOC}/${f:C/^doc\///}
164.endfor 165.endfor
165.for f in ${EXT_DOCS} 166.for f in ${EXT_DOCS}
166 ${INSTALL_DATA} ${WRKSRC}/ext/${f} ${DESTDIR}${PREFIX}/${RUBY_DOC} 167 ${INSTALL_DATA} ${WRKSRC}/ext/${f} ${DESTDIR}${PREFIX}/${RUBY_DOC}
167.endfor 168.endfor
168 cd ${WRKSRC}/ext/ripper; ${PAX} -rw README ${DESTDIR}${PREFIX}/${RUBY_DOC}/ripper 169 cd ${WRKSRC}/ext/ripper; ${PAX} -rw README ${DESTDIR}${PREFIX}/${RUBY_DOC}/ripper
169 cd ${WRKSRC}/ext/stringio; ${PAX} -rw README ${DESTDIR}${PREFIX}/${RUBY_DOC}/stringio 170 cd ${WRKSRC}/ext/stringio; ${PAX} -rw README ${DESTDIR}${PREFIX}/${RUBY_DOC}/stringio
170 cd ${WRKSRC}/sample; ${PAX} -rw . ${DESTDIR}${PREFIX}/${RUBY_EG} 171 cd ${WRKSRC}/sample; ${PAX} -rw . ${DESTDIR}${PREFIX}/${RUBY_EG}
171.for f in ${BIGDECIMAL_EXAMPLES} 172.for f in ${BIGDECIMAL_EXAMPLES}
172 ${INSTALL_DATA} ${RUBY_WRKSRC}/ext/bigdecimal/sample/${f} \ 173 ${INSTALL_DATA} ${RUBY_WRKSRC}/ext/bigdecimal/sample/${f} \
173 ${DESTDIR}${PREFIX}/${RUBY_EG}/bigdecimal 174 ${DESTDIR}${PREFIX}/${RUBY_EG}/bigdecimal
174.endfor 175.endfor
175.for f in ${OPENSSL_EXAMPLES} 176.for f in ${OPENSSL_EXAMPLES}
176 ${INSTALL_DATA} ${RUBY_WRKSRC}/sample/openssl/${f} \ 177 ${INSTALL_DATA} ${RUBY_WRKSRC}/sample/openssl/${f} \
177 ${DESTDIR}${PREFIX}/${RUBY_EG}/openssl 178 ${DESTDIR}${PREFIX}/${RUBY_EG}/openssl
178.endfor 179.endfor
179 ${RUBY_GENERATE_PLIST} 180 ${RUBY_GENERATE_PLIST}
180 181
181.include "../../mk/bdb.buildlink3.mk" 182.include "../../mk/bdb.buildlink3.mk"
182.include "../../converters/libiconv/buildlink3.mk" 183.include "../../converters/libiconv/buildlink3.mk"
183.include "../../devel/zlib/buildlink3.mk" 184.include "../../devel/zlib/buildlink3.mk"
184.include "../../security/openssl/buildlink3.mk" 185.include "../../security/openssl/buildlink3.mk"
185.include "../../textproc/libyaml/buildlink3.mk" 186.include "../../textproc/libyaml/buildlink3.mk"
186.include "../../lang/ruby/Makefile.common" 187.include "../../lang/ruby/Makefile.common"
187.include "../../mk/bsd.pkg.mk" 188.include "../../mk/bsd.pkg.mk"
cvs diff -r1.13.2.1 -r1.13.2.2 pkgsrc/lang/ruby21-base/Attic/distinfo (switch to unified diff)

--- pkgsrc/lang/ruby21-base/Attic/distinfo 2015/04/26 08:36:34 1.13.2.1
+++ pkgsrc/lang/ruby21-base/Attic/distinfo 2015/06/01 01:46:36 1.13.2.2
@@ -1,37 +1,38 @@ @@ -1,37 +1,38 @@
1$NetBSD: distinfo,v 1.13.2.1 2015/04/26 08:36:34 tron Exp $ 1$NetBSD: distinfo,v 1.13.2.2 2015/06/01 01:46:36 hiramatsu Exp $
2 2
3SHA1 (ruby-2.1.6.tar.bz2) = 380c3a5fa508fdaa2b227dbc00c56f703fd271d4 3SHA1 (ruby-2.1.6.tar.bz2) = 380c3a5fa508fdaa2b227dbc00c56f703fd271d4
4RMD160 (ruby-2.1.6.tar.bz2) = fa473e794ee0df4cd30aebfa70af16840a618c43 4RMD160 (ruby-2.1.6.tar.bz2) = fa473e794ee0df4cd30aebfa70af16840a618c43
5Size (ruby-2.1.6.tar.bz2) = 12011651 bytes 5Size (ruby-2.1.6.tar.bz2) = 12011651 bytes
6SHA1 (patch-configure) = 3c9f007caddd7155c3f3495f81eabe55b86651a5 6SHA1 (patch-configure) = 7f1f6d2dc7d32c96d6ae65562a9bc6d50d2b79dd
7SHA1 (patch-ext_dbm_extconf.rb) = 08520edd956e17cb6cc80b6ee2c77af77a834bd2 7SHA1 (patch-ext_dbm_extconf.rb) = 08520edd956e17cb6cc80b6ee2c77af77a834bd2
8SHA1 (patch-ext_tk_extconf.rb) = fc80ef5a2859736ae85303cfb2fc78ce8bc70fbc 8SHA1 (patch-ext_tk_extconf.rb) = fc80ef5a2859736ae85303cfb2fc78ce8bc70fbc
9SHA1 (patch-ext_tk_lib_tk.rb) = 78034ed6fa0f24099ce06a717da2423731b276cb 9SHA1 (patch-ext_tk_lib_tk.rb) = 78034ed6fa0f24099ce06a717da2423731b276cb
10SHA1 (patch-ext_tk_lib_tk_autoload.rb) = e8bcb93feae90fd46531a412f6c963a6d5d2c132 10SHA1 (patch-ext_tk_lib_tk_autoload.rb) = e8bcb93feae90fd46531a412f6c963a6d5d2c132
11SHA1 (patch-ext_tk_lib_tk_fontchooser.rb) = cb0155332e5f519ada386fae770cd2f879527323 11SHA1 (patch-ext_tk_lib_tk_fontchooser.rb) = cb0155332e5f519ada386fae770cd2f879527323
12SHA1 (patch-ext_tk_lib_tk_tk__mac.rb) = 24b9f282558200780adbf93e71edd1aa52d1c82b 12SHA1 (patch-ext_tk_lib_tk_tk__mac.rb) = 24b9f282558200780adbf93e71edd1aa52d1c82b
13SHA1 (patch-ext_tk_lib_tkextlib_tcllib_validator.rb) = fb0cb5a138c2ae311d368ec4472ddd6bc36a0709 13SHA1 (patch-ext_tk_lib_tkextlib_tcllib_validator.rb) = fb0cb5a138c2ae311d368ec4472ddd6bc36a0709
14SHA1 (patch-ext_tk_lib_tkextlib_tile_treeview.rb) = e31201b5d0f5c333f14b795ac5e670fdb9a250cf 14SHA1 (patch-ext_tk_lib_tkextlib_tile_treeview.rb) = e31201b5d0f5c333f14b795ac5e670fdb9a250cf
15SHA1 (patch-ext_tk_lib_tkextlib_tkimg_dted.rb) = b0786f50ebab4b5a0ccf916054bc13fbd6820541 15SHA1 (patch-ext_tk_lib_tkextlib_tkimg_dted.rb) = b0786f50ebab4b5a0ccf916054bc13fbd6820541
16SHA1 (patch-ext_tk_lib_tkextlib_tkimg_raw.rb) = 92a4bc7b995554b9933b1e9f9ce4df87e365bcfb 16SHA1 (patch-ext_tk_lib_tkextlib_tkimg_raw.rb) = 92a4bc7b995554b9933b1e9f9ce4df87e365bcfb
17SHA1 (patch-ext_tk_tcltklib.c) = 475affcb88a06ac6daf622814a9da5027ca3d34e 17SHA1 (patch-ext_tk_tcltklib.c) = 475affcb88a06ac6daf622814a9da5027ca3d34e
 18SHA1 (patch-lib_mkmf.rb) = 04607b73702a8ee7edfbb371ebf88ebe8a4fc428
18SHA1 (patch-lib_rdoc_ri_driver.rb) = 5bdd3ed6f50a2ea79f643c6bebd7ad0063e79051 19SHA1 (patch-lib_rdoc_ri_driver.rb) = 5bdd3ed6f50a2ea79f643c6bebd7ad0063e79051
19SHA1 (patch-lib_rubygems.rb) = adfbb16b9d90fe38e253bcbd34d0efa712077f21 20SHA1 (patch-lib_rubygems.rb) = adfbb16b9d90fe38e253bcbd34d0efa712077f21
20SHA1 (patch-lib_rubygems_commands_setup__command.rb) = 46991d63256d0d3cc2f707fb286d1691331ad40e 21SHA1 (patch-lib_rubygems_commands_setup__command.rb) = 46991d63256d0d3cc2f707fb286d1691331ad40e
21SHA1 (patch-lib_rubygems_commands_uninstall__command.rb) = 13b7f3bceb2876228027447640d51fde2700a970 22SHA1 (patch-lib_rubygems_commands_uninstall__command.rb) = 13b7f3bceb2876228027447640d51fde2700a970
22SHA1 (patch-lib_rubygems_commands_unpack__command.rb) = 48824278d5a0f0435d44755fbfcda55032792ea0 23SHA1 (patch-lib_rubygems_commands_unpack__command.rb) = 48824278d5a0f0435d44755fbfcda55032792ea0
23SHA1 (patch-lib_rubygems_config__file.rb) = 0d863d3f886c1ed83585d96064725e7db7bec1bc 24SHA1 (patch-lib_rubygems_config__file.rb) = 0d863d3f886c1ed83585d96064725e7db7bec1bc
24SHA1 (patch-lib_rubygems_defaults.rb) = 5a55a54988b360b995e05e6dda7ed25d9cd1d90f 25SHA1 (patch-lib_rubygems_defaults.rb) = 5a55a54988b360b995e05e6dda7ed25d9cd1d90f
25SHA1 (patch-lib_rubygems_dependency__installer.rb) = d88441fe44de8ee61a5548dfbe0c12aa2bb5ace4 26SHA1 (patch-lib_rubygems_dependency__installer.rb) = d88441fe44de8ee61a5548dfbe0c12aa2bb5ace4
26SHA1 (patch-lib_rubygems_install__update__options.rb) = 9a15d509928aa0440691bef8ad43bbfd2688542f 27SHA1 (patch-lib_rubygems_install__update__options.rb) = 9a15d509928aa0440691bef8ad43bbfd2688542f
27SHA1 (patch-lib_rubygems_installer.rb) = e3c077156f135b9a8a368ea39e2728a60e6f4378 28SHA1 (patch-lib_rubygems_installer.rb) = e3c077156f135b9a8a368ea39e2728a60e6f4378
28SHA1 (patch-lib_rubygems_platform.rb) = 965a916814127ef78f43b89b7af5e06d5d83b24f 29SHA1 (patch-lib_rubygems_platform.rb) = 965a916814127ef78f43b89b7af5e06d5d83b24f
29SHA1 (patch-lib_rubygems_specification.rb) = 0b30e2da8b5621ffc0f91fadc94f06ba30f47d41 30SHA1 (patch-lib_rubygems_specification.rb) = 0b30e2da8b5621ffc0f91fadc94f06ba30f47d41
30SHA1 (patch-lib_rubygems_uninstaller.rb) = 87fdddc435440aab57a6d44aba64abd0b2de6907 31SHA1 (patch-lib_rubygems_uninstaller.rb) = 87fdddc435440aab57a6d44aba64abd0b2de6907
31SHA1 (patch-man_erb.1) = 1fe6ce4f4fe6418bfabb5e132a63596562030116 32SHA1 (patch-man_erb.1) = 1fe6ce4f4fe6418bfabb5e132a63596562030116
32SHA1 (patch-man_irb.1) = 2bf807b4c1b1c68d1f518caa054cfd900e0fedb7 33SHA1 (patch-man_irb.1) = 2bf807b4c1b1c68d1f518caa054cfd900e0fedb7
33SHA1 (patch-man_ri.1) = af855135020f18c361cc55af676adc75e26bf4d3 34SHA1 (patch-man_ri.1) = af855135020f18c361cc55af676adc75e26bf4d3
34SHA1 (patch-man_ruby.1) = 5bc1e2e7c4c640659e33d0131d0982ce4e0d9fe0 35SHA1 (patch-man_ruby.1) = 5bc1e2e7c4c640659e33d0131d0982ce4e0d9fe0
35SHA1 (patch-template_verconf.h.in) = 1f4c0676d1335a9fc32ccf8cbfa41678dde96dcd 36SHA1 (patch-template_verconf.h.in) = 1f4c0676d1335a9fc32ccf8cbfa41678dde96dcd
36SHA1 (patch-test_rubygems_test__gem.rb) = 4d8cc50c2782e29eefea0ea6deedf295a7f09bc2 37SHA1 (patch-test_rubygems_test__gem.rb) = 4d8cc50c2782e29eefea0ea6deedf295a7f09bc2
37SHA1 (patch-tool_rbinstall.rb) = 845e5136dc2b5e3c41aeb833890e786544d6f5d5 38SHA1 (patch-tool_rbinstall.rb) = 845e5136dc2b5e3c41aeb833890e786544d6f5d5
cvs diff -r1.2.8.1 -r1.2.8.2 pkgsrc/lang/ruby21-base/patches/Attic/patch-configure (switch to unified diff)

--- pkgsrc/lang/ruby21-base/patches/Attic/patch-configure 2015/04/26 08:36:34 1.2.8.1
+++ pkgsrc/lang/ruby21-base/patches/Attic/patch-configure 2015/06/01 01:46:36 1.2.8.2
@@ -1,119 +1,119 @@ @@ -1,119 +1,119 @@
1$NetBSD: patch-configure,v 1.2.8.1 2015/04/26 08:36:34 tron Exp $ 1$NetBSD: patch-configure,v 1.2.8.2 2015/06/01 01:46:36 hiramatsu Exp $
2 2
3* Adding Interix and MirBSD support. 3* Adding Interix support.
4* Ignore doxygen. 4* Ignore doxygen.
5 5
6--- configure.orig 2014-11-13 13:38:30.000000000 +0000 6--- configure.orig 2014-11-13 13:38:30.000000000 +0000
7+++ configure 7+++ configure
8@@ -5271,7 +5271,7 @@ esac 8@@ -5271,7 +5271,7 @@ esac
9 else 9 else
10 if test x"$target_alias" = x; then 10 if test x"$target_alias" = x; then
11 case "$target_os" in #( 11 case "$target_os" in #(
12- darwin*) : 12- darwin*) :
13+ notdarwin*) : 13+ notdarwin*) :
14  14
15 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for real target cpu" >&5 15 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for real target cpu" >&5
16 $as_echo_n "checking for real target cpu... " >&6; } 16 $as_echo_n "checking for real target cpu... " >&6; }
17@@ -8631,6 +8631,10 @@ esac 17@@ -8631,6 +8631,10 @@ esac
18 ac_cv_func_isinf=yes 18 ac_cv_func_isinf=yes
19 ac_cv_func_isnan=yes 19 ac_cv_func_isnan=yes
20 ;; #( 20 ;; #(
21+ interix*) : 21+ interix*) :
22+ LIBS="-lm $LIBS" 22+ LIBS="-lm $LIBS"
23+ ac_cv_func_getpgrp_void=yes 23+ ac_cv_func_getpgrp_void=yes
24+ ;; #( 24+ ;; #(
25 nacl) : 25 nacl) :
26  26
27 LIBS="-lm $LIBS" 27 LIBS="-lm $LIBS"
28@@ -16323,6 +16327,8 @@ else 28@@ -16323,6 +16327,8 @@ else
29 # ifdef _MSC_VER 29 # ifdef _MSC_VER
30 # include <malloc.h> 30 # include <malloc.h>
31 # define alloca _alloca 31 # define alloca _alloca
32+# elif defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(__OpenBSD__) 32+# elif defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(__OpenBSD__)
33+# include <stdlib.h> 33+# include <stdlib.h>
34 # else 34 # else
35 # ifdef HAVE_ALLOCA_H 35 # ifdef HAVE_ALLOCA_H
36 # include <alloca.h> 36 # include <alloca.h>
37@@ -20040,7 +20046,9 @@ esac ;; #( 37@@ -20040,7 +20046,9 @@ esac ;; #(
38 interix*) : 38 interix*) :
39 : ${LDSHARED='$(CC) -shared'} 39 : ${LDSHARED='$(CC) -shared'}
40 XLDFLAGS="$XLDFLAGS -Wl,-E" 40 XLDFLAGS="$XLDFLAGS -Wl,-E"
41+ DLDFLAGS="$DLDFLAGS "'-Wl,-h,$(.TARGET) -Wl,--image-base,$$(($$RANDOM %4096/2*262144+1342177280))' 41+ DLDFLAGS="$DLDFLAGS "'-Wl,-h,$(.TARGET) -Wl,--image-base,$$(($$RANDOM %4096/2*262144+1342177280))'
42 LIBPATHFLAG=" -L%1\$-s" 42 LIBPATHFLAG=" -L%1\$-s"
43+ RPATHFLAG=' -Wl,-R%1$-s' 43+ RPATHFLAG=' -Wl,-R%1$-s'
44 rb_cv_dlopen=yes ;; #( 44 rb_cv_dlopen=yes ;; #(
45 freebsd*|dragonfly*) : 45 freebsd*|dragonfly*) :
46  46
47@@ -21041,7 +21049,7 @@ esac 47@@ -21041,7 +21049,7 @@ esac
48 freebsd*|dragonfly*) : 48 freebsd*|dragonfly*) :
49  49
50 SOLIBS='$(LIBS)' 50 SOLIBS='$(LIBS)'
51- LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR)' 51- LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR)'
52+ LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR)$(TEENY)' 52+ LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR)$(TEENY)'
53 if test "$rb_cv_binary_elf" != "yes" ; then 53 if test "$rb_cv_binary_elf" != "yes" ; then
54 LIBRUBY_SO="$LIBRUBY_SO.\$(TEENY)" 54 LIBRUBY_SO="$LIBRUBY_SO.\$(TEENY)"
55 LIBRUBY_ALIASES='' 55 LIBRUBY_ALIASES=''
56@@ -21120,7 +21128,12 @@ esac 56@@ -21120,7 +21128,12 @@ esac
57 ;; #( 57 ;; #(
58 interix*) : 58 interix*) :
59  59
60- LIBRUBYARG_SHARED='-L. -L${libdir} -l$(RUBY_SO_NAME)' 60- LIBRUBYARG_SHARED='-L. -L${libdir} -l$(RUBY_SO_NAME)'
61+ SOLIBS='$(LIBS)' 61+ SOLIBS='$(LIBS)'
62+ LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR).$(TEENY)' 62+ LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR).$(TEENY)'
63+ # link explicitly to 0x48000000 63+ # link explicitly to 0x48000000
64+ LIBRUBY_DLDFLAGS='-Wl,-h,lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR) -Wl,--image-base,1207959552' 64+ LIBRUBY_DLDFLAGS='-Wl,-h,lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR) -Wl,--image-base,1207959552'
65+ LIBRUBYARG_SHARED='-Wl,-R -Wl,${PREFIX}/lib} -L${libdir} -L. -l$(RUBY_SO_NAME)' 65+ LIBRUBYARG_SHARED='-Wl,-R -Wl,${PREFIX}/lib} -L${libdir} -L. -l$(RUBY_SO_NAME)'
66+ LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR) lib$(RUBY_SO_NAME).so' 66+ LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR) lib$(RUBY_SO_NAME).so'
67 ;; #( 67 ;; #(
68 mingw*|cygwin*|mswin*) : 68 mingw*|cygwin*|mswin*) :
69  69
70@@ -21278,7 +21291,7 @@ esac 70@@ -21278,7 +21291,7 @@ esac
71 esac 71 esac
72 if test "$enable_rpath" = yes; then 72 if test "$enable_rpath" = yes; then
73 test -z "$LIBRUBY_RPATHFLAGS" || LIBRUBY_RPATHFLAGS="$LIBRUBY_RPATHFLAGS " 73 test -z "$LIBRUBY_RPATHFLAGS" || LIBRUBY_RPATHFLAGS="$LIBRUBY_RPATHFLAGS "
74- LIBRUBY_RPATHFLAGS="$LIBRUBY_RPATHFLAGS${linker_flag}-R ${linker_flag}${libprefix}" 74- LIBRUBY_RPATHFLAGS="$LIBRUBY_RPATHFLAGS${linker_flag}-R ${linker_flag}${libprefix}"
75+ LIBRUBY_RPATHFLAGS="$LIBRUBY_RPATHFLAGS${linker_flag}-R ${linker_flag}${PREFIX}/lib" 75+ LIBRUBY_RPATHFLAGS="$LIBRUBY_RPATHFLAGS${linker_flag}-R ${linker_flag}${PREFIX}/lib"
76 test "x$cross_compiling" = xyes || LIBRUBY_RPATHFLAGS="$LIBRUBY_RPATHFLAGS -L${libprefix}" 76 test "x$cross_compiling" = xyes || LIBRUBY_RPATHFLAGS="$LIBRUBY_RPATHFLAGS -L${libprefix}"
77 LIBRUBYARG_SHARED="$LIBRUBY_RPATHFLAGS $LIBRUBYARG_SHARED" 77 LIBRUBYARG_SHARED="$LIBRUBY_RPATHFLAGS $LIBRUBYARG_SHARED"
78 LIBRUBYARG_STATIC="$LIBRUBY_RPATHFLAGS $LIBRUBYARG_STATIC" 78 LIBRUBYARG_STATIC="$LIBRUBY_RPATHFLAGS $LIBRUBYARG_STATIC"
79@@ -21591,11 +21604,7 @@ if test "$install_doc" != no; then 79@@ -21591,11 +21604,7 @@ if test "$install_doc" != no; then
80 else 80 else
81 RDOCTARGET="nodoc" 81 RDOCTARGET="nodoc"
82 fi 82 fi
83- if test "$install_capi" != no -a -n "$DOXYGEN"; then 83- if test "$install_capi" != no -a -n "$DOXYGEN"; then
84- CAPITARGET="capi" 84- CAPITARGET="capi"
85- else 85- else
86- CAPITARGET="nodoc" 86- CAPITARGET="nodoc"
87- fi 87- fi
88+ CAPITARGET="nodoc" 88+ CAPITARGET="nodoc"
89 else 89 else
90 RDOCTARGET="nodoc" 90 RDOCTARGET="nodoc"
91 CAPITARGET="nodoc" 91 CAPITARGET="nodoc"
92@@ -22180,7 +22189,7 @@ if test ${RUBY_LIB_VERSION_STYLE+set}; t 92@@ -22180,7 +22189,7 @@ if test ${RUBY_LIB_VERSION_STYLE+set}; t
93 elif test -z "${ruby_version}"; then 93 elif test -z "${ruby_version}"; then
94 as_fn_error $? "No ruby version, No place for bundled libraries" "$LINENO" 5 94 as_fn_error $? "No ruby version, No place for bundled libraries" "$LINENO" 5
95 else 95 else
96- RUBY_LIB_VERSION="\"${ruby_version}\"" 96- RUBY_LIB_VERSION="\"${ruby_version}\""
97+ RUBY_LIB_VERSION="${ruby_version}" 97+ RUBY_LIB_VERSION="${ruby_version}"
98 fi 98 fi
99  99
100  100
101@@ -23686,17 +23695,7 @@ which seems to be undefined. Please mak 101@@ -23686,17 +23695,7 @@ which seems to be undefined. Please mak
102 "Makefile":F) 102 "Makefile":F)
103 tmpmk=confmk$$.tmp 103 tmpmk=confmk$$.tmp
104 { 104 {
105- if test ${VCS+set}; then 105- if test ${VCS+set}; then
106- : 106- :
107- elif svn info "$srcdir" > /dev/null 2>&1; then 107- elif svn info "$srcdir" > /dev/null 2>&1; then
108- VCS='svn' 108- VCS='svn'
109- elif test -d "$srcdir/.git/svn"; then 109- elif test -d "$srcdir/.git/svn"; then
110- VCS='git svn' 110- VCS='git svn'
111- elif test -d "$srcdir/.git"; then 111- elif test -d "$srcdir/.git"; then
112- VCS='git' 112- VCS='git'
113- else 113- else
114- VCS='echo cannot' 114- VCS='echo cannot'
115- fi 115- fi
116+ VCS='echo cannot' 116+ VCS='echo cannot'
117 case "$VCS" in #( 117 case "$VCS" in #(
118 svn) : 118 svn) :
119 VCSUP='$(VCS) up $(SVNUPOPTIONS)' ;; #( 119 VCSUP='$(VCS) up $(SVNUPOPTIONS)' ;; #(
File Added: pkgsrc/lang/ruby21-base/patches/Attic/patch-lib_mkmf.rb
$NetBSD: patch-lib_mkmf.rb,v 1.1.2.2 2015/06/01 01:46:36 hiramatsu Exp $

Avoid to generate empty command line on some platforms:

$(DLLIB): $(OBJS) Makefile
...
	$(Q) $(POSTLINK)

And POSTLINK is empty macro.  In such case, GNU make ignore empty command
line but BSD make tries to execute it and causes error.

--- lib/mkmf.rb.orig	2015-03-17 16:56:55.000000000 +0000
+++ lib/mkmf.rb
@@ -1909,6 +1909,7 @@ LDSHARED = #{CONFIG['LDSHARED']}
 LDSHAREDXX = #{config_string('LDSHAREDXX') || '$(LDSHARED)'}
 AR = #{CONFIG['AR']}
 EXEEXT = #{CONFIG['EXEEXT']}
+POSTLINK = #{CONFIG['POSTLINK']}
 
 }
     CONFIG.each do |key, val|