--- Mk/bsd.ruby.mk	(revision 515302)
+++ Mk/bsd.ruby.mk	(working copy)
@@ -54,15 +54,10 @@ 
 #
 # RUBY_PKGNAMEPREFIX	- Common PKGNAMEPREFIX for ruby ports
 #			  (default: ruby${RUBY_SUFFIX}-)
-# RUBY_RELVERSION	- Full version of ruby without preview/beta suffix in
+# RUBY_VERSION		- Full version of ruby without preview/beta suffix in
 #			  the form of `x.y.z' (see below for current value).
-# RUBY_RELVERSION_CODE	- Integer version of RUBY_RELVERSION in the form of
+# RUBY_VERSION_CODE	- Integer version of RUBY_VERSION in the form of 
 #			  `xyz'.
-# RUBY_VERSION		- Composite version of RUBY_RELVERSION and
-#			  RUBY_PATCHLEVEL in the form of `x.y.z.p'.
-#			  (default: ${RUBY_RELVERSION}.${RUBY_PATCHLEVEL})
-# RUBY_VERSION_CODE	- Composite integer version of RUBY_VERSION in the form
-#			  of `xyzp'.
 # RUBY_PORTVERSION	- PORTVERSION for the standard ruby ports (ruby,
 #			  ruby-gdbm, etc.).
 # RUBY_PORTREVISION	- PORTREVISION for the standard ruby ports.
@@ -154,10 +149,9 @@ 
 #
 # Ruby 2.4
 #
-RUBY_RELVERSION=	2.4.9
+RUBY_VERSION=		2.4.9
 RUBY_PORTREVISION=	0
 RUBY_PORTEPOCH=		1
-RUBY_PATCHLEVEL=	0
 RUBY24=			""	# PLIST_SUB helpers
 
 . elif ${RUBY_VER} == 2.5
@@ -164,10 +158,9 @@ 
 #
 # Ruby 2.5
 #
-RUBY_RELVERSION=	2.5.7
+RUBY_VERSION=		2.5.7
 RUBY_PORTREVISION=	0
 RUBY_PORTEPOCH=		1
-RUBY_PATCHLEVEL=	0
 RUBY25=			""	# PLIST_SUB helpers
 
 . elif ${RUBY_VER} == 2.6
@@ -174,10 +167,9 @@ 
 #
 # Ruby 2.6
 #
-RUBY_RELVERSION=	2.6.5
+RUBY_VERSION=		2.6.5
 RUBY_PORTREVISION=	0
 RUBY_PORTEPOCH=		1
-RUBY_PATCHLEVEL=	0
 RUBY26=			""	# PLIST_SUB helpers
 
 # When adding a version, please keep the comment in
@@ -205,13 +197,7 @@ 
 .endif
 .endif
 
-.if ${RUBY_PATCHLEVEL} == 0
-RUBY_VERSION?=		${RUBY_RELVERSION}
-RUBY_DISTVERSION?=	${RUBY_RELVERSION}
-.else
-RUBY_VERSION?=		${RUBY_RELVERSION}.${RUBY_PATCHLEVEL}
-RUBY_DISTVERSION?=	${RUBY_RELVERSION}-p${RUBY_PATCHLEVEL}
-.endif
+RUBY_DISTVERSION?=	${RUBY_VERSION}
 
 RUBY_WRKSRC=		${WRKDIR}/ruby-${RUBY_DISTVERSION}
 
--- lang/ruby24/Makefile	(revision 515302)
+++ lang/ruby24/Makefile	(working copy)
@@ -69,8 +69,7 @@ 
 READLINE_USES=		readline:port
 
 CPE_VENDOR=	ruby-lang
-CPE_VERSION=	${RUBY_RELVERSION}
-CPE_UPDATE=	p${RUBY_PATCHLEVEL}
+CPE_VERSION=	${RUBY_VERSION}
 
 .include <bsd.port.pre.mk>
 
--- lang/ruby25/Makefile	(revision 515302)
+++ lang/ruby25/Makefile	(working copy)
@@ -69,8 +69,7 @@ 
 READLINE_USES=		readline:port
 
 CPE_VENDOR=	ruby-lang
-CPE_VERSION=	${RUBY_RELVERSION}
-CPE_UPDATE=	p${RUBY_PATCHLEVEL}
+CPE_VERSION=	${RUBY_VERSION}
 
 .include <bsd.port.pre.mk>
 
--- lang/ruby26/Makefile	(revision 515302)
+++ lang/ruby26/Makefile	(working copy)
@@ -70,8 +70,7 @@ 
 READLINE_USES=		readline:port
 
 CPE_VENDOR=	ruby-lang
-CPE_VERSION=	${RUBY_RELVERSION}
-CPE_UPDATE=	p${RUBY_PATCHLEVEL}
+CPE_VERSION=	${RUBY_VERSION}
 
 .include <bsd.port.pre.mk>