View | Details | Raw Unified | Return to bug 241473 | Differences between
and this patch

Collapse All | Expand All

(-)Mk/bsd.ruby.mk (-20 / +6 lines)
Lines 54-68 Link Here
54
#
54
#
55
# RUBY_PKGNAMEPREFIX	- Common PKGNAMEPREFIX for ruby ports
55
# RUBY_PKGNAMEPREFIX	- Common PKGNAMEPREFIX for ruby ports
56
#			  (default: ruby${RUBY_SUFFIX}-)
56
#			  (default: ruby${RUBY_SUFFIX}-)
57
# RUBY_RELVERSION	- Full version of ruby without preview/beta suffix in
57
# RUBY_VERSION		- Full version of ruby without preview/beta suffix in
58
#			  the form of `x.y.z' (see below for current value).
58
#			  the form of `x.y.z' (see below for current value).
59
# RUBY_RELVERSION_CODE	- Integer version of RUBY_RELVERSION in the form of
59
# RUBY_VERSION_CODE	- Integer version of RUBY_VERSION in the form of 
60
#			  `xyz'.
60
#			  `xyz'.
61
# RUBY_VERSION		- Composite version of RUBY_RELVERSION and
62
#			  RUBY_PATCHLEVEL in the form of `x.y.z.p'.
63
#			  (default: ${RUBY_RELVERSION}.${RUBY_PATCHLEVEL})
64
# RUBY_VERSION_CODE	- Composite integer version of RUBY_VERSION in the form
65
#			  of `xyzp'.
66
# RUBY_PORTVERSION	- PORTVERSION for the standard ruby ports (ruby,
61
# RUBY_PORTVERSION	- PORTVERSION for the standard ruby ports (ruby,
67
#			  ruby-gdbm, etc.).
62
#			  ruby-gdbm, etc.).
68
# RUBY_PORTREVISION	- PORTREVISION for the standard ruby ports.
63
# RUBY_PORTREVISION	- PORTREVISION for the standard ruby ports.
Lines 154-163 Link Here
154
#
149
#
155
# Ruby 2.4
150
# Ruby 2.4
156
#
151
#
157
RUBY_RELVERSION=	2.4.9
152
RUBY_VERSION=		2.4.9
158
RUBY_PORTREVISION=	0
153
RUBY_PORTREVISION=	0
159
RUBY_PORTEPOCH=		1
154
RUBY_PORTEPOCH=		1
160
RUBY_PATCHLEVEL=	0
161
RUBY24=			""	# PLIST_SUB helpers
155
RUBY24=			""	# PLIST_SUB helpers
162
156
163
. elif ${RUBY_VER} == 2.5
157
. elif ${RUBY_VER} == 2.5
Lines 164-173 Link Here
164
#
158
#
165
# Ruby 2.5
159
# Ruby 2.5
166
#
160
#
167
RUBY_RELVERSION=	2.5.7
161
RUBY_VERSION=		2.5.7
168
RUBY_PORTREVISION=	0
162
RUBY_PORTREVISION=	0
169
RUBY_PORTEPOCH=		1
163
RUBY_PORTEPOCH=		1
170
RUBY_PATCHLEVEL=	0
171
RUBY25=			""	# PLIST_SUB helpers
164
RUBY25=			""	# PLIST_SUB helpers
172
165
173
. elif ${RUBY_VER} == 2.6
166
. elif ${RUBY_VER} == 2.6
Lines 174-183 Link Here
174
#
167
#
175
# Ruby 2.6
168
# Ruby 2.6
176
#
169
#
177
RUBY_RELVERSION=	2.6.5
170
RUBY_VERSION=		2.6.5
178
RUBY_PORTREVISION=	0
171
RUBY_PORTREVISION=	0
179
RUBY_PORTEPOCH=		1
172
RUBY_PORTEPOCH=		1
180
RUBY_PATCHLEVEL=	0
181
RUBY26=			""	# PLIST_SUB helpers
173
RUBY26=			""	# PLIST_SUB helpers
182
174
183
# When adding a version, please keep the comment in
175
# When adding a version, please keep the comment in
Lines 205-217 Link Here
205
.endif
197
.endif
206
.endif
198
.endif
207
199
208
.if ${RUBY_PATCHLEVEL} == 0
200
RUBY_DISTVERSION?=	${RUBY_VERSION}
209
RUBY_VERSION?=		${RUBY_RELVERSION}
210
RUBY_DISTVERSION?=	${RUBY_RELVERSION}
211
.else
212
RUBY_VERSION?=		${RUBY_RELVERSION}.${RUBY_PATCHLEVEL}
213
RUBY_DISTVERSION?=	${RUBY_RELVERSION}-p${RUBY_PATCHLEVEL}
214
.endif
215
201
216
RUBY_WRKSRC=		${WRKDIR}/ruby-${RUBY_DISTVERSION}
202
RUBY_WRKSRC=		${WRKDIR}/ruby-${RUBY_DISTVERSION}
217
203
(-)lang/ruby24/Makefile (-2 / +1 lines)
Lines 69-76 Link Here
69
READLINE_USES=		readline:port
69
READLINE_USES=		readline:port
70
70
71
CPE_VENDOR=	ruby-lang
71
CPE_VENDOR=	ruby-lang
72
CPE_VERSION=	${RUBY_RELVERSION}
72
CPE_VERSION=	${RUBY_VERSION}
73
CPE_UPDATE=	p${RUBY_PATCHLEVEL}
74
73
75
.include <bsd.port.pre.mk>
74
.include <bsd.port.pre.mk>
76
75
(-)lang/ruby25/Makefile (-2 / +1 lines)
Lines 69-76 Link Here
69
READLINE_USES=		readline:port
69
READLINE_USES=		readline:port
70
70
71
CPE_VENDOR=	ruby-lang
71
CPE_VENDOR=	ruby-lang
72
CPE_VERSION=	${RUBY_RELVERSION}
72
CPE_VERSION=	${RUBY_VERSION}
73
CPE_UPDATE=	p${RUBY_PATCHLEVEL}
74
73
75
.include <bsd.port.pre.mk>
74
.include <bsd.port.pre.mk>
76
75
(-)lang/ruby26/Makefile (-2 / +1 lines)
Lines 70-77 Link Here
70
READLINE_USES=		readline:port
70
READLINE_USES=		readline:port
71
71
72
CPE_VENDOR=	ruby-lang
72
CPE_VENDOR=	ruby-lang
73
CPE_VERSION=	${RUBY_RELVERSION}
73
CPE_VERSION=	${RUBY_VERSION}
74
CPE_UPDATE=	p${RUBY_PATCHLEVEL}
75
74
76
.include <bsd.port.pre.mk>
75
.include <bsd.port.pre.mk>
77
76

Return to bug 241473