FreeBSD Bugzilla – Attachment 208626 Details for
Bug 241473
Mk/bsd.ruby.mk: Remove RUBY_PATCHLEVEL, RUBY_RELVERSION, RUBY_RELVERSION_CODE and RUBY_DISTVERSION
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Updated patch file
Mk_bsd.ruby.mk.patch (text/plain), 4.04 KB, created by
Yasuhiro Kimura
on 2019-10-27 07:32:53 UTC
(
hide
)
Description:
Updated patch file
Filename:
MIME Type:
Creator:
Yasuhiro Kimura
Created:
2019-10-27 07:32:53 UTC
Size:
4.04 KB
patch
obsolete
>Index: Mk/bsd.ruby.mk >=================================================================== >--- Mk/bsd.ruby.mk (revision 515742) >+++ 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. >@@ -69,7 +64,6 @@ > # RUBY_PORTEPOCH - PORTEPOCH for the standard ruby ports. > # RUBY_DISTNAME - DISTNAME for the standard ruby ports, i.e. the > # basename of the ruby distribution tarball. >-# RUBY_DISTVERSION - The version number part of RUBY_DISTNAME. > # RUBY_PATCHFILES - PATCHFILES for the standard ruby ports, i.e. the > # basename of the ruby distribution tarball. > # RUBY_WRKSRC - WRKSRC for the ruby port. >@@ -154,10 +148,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 +157,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 +166,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,16 +196,8 @@ > .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_WRKSRC= ${WRKDIR}/ruby-${RUBY_VERSION} > >-RUBY_WRKSRC= ${WRKDIR}/ruby-${RUBY_DISTVERSION} >- > RUBY_CONFIGURE_ARGS+= --with-rubyhdrdir="${PREFIX}/include/ruby-${RUBY_VER}/" \ > --with-rubylibprefix="${PREFIX}/lib/ruby" \ > --docdir="${RUBY_DOCDIR}" \ >@@ -236,10 +219,9 @@ > > RUBY_DEFAULT_SUFFIX?= ${RUBY_DEFAULT_VER:S/.//} > >-RUBY_DISTVERSION?= ${RUBY_VERSION} > RUBY_PORTVERSION?= ${RUBY_VERSION} > MASTER_SITE_SUBDIR_RUBY?= ${RUBY_VER} >-RUBY_DISTNAME?= ruby-${RUBY_DISTVERSION} >+RUBY_DISTNAME?= ruby-${RUBY_VERSION} > > RUBY_WRKSRC?= ${WRKDIR}/${RUBY_DISTNAME} > >Index: lang/ruby24/Makefile >=================================================================== >--- lang/ruby24/Makefile (revision 515742) >+++ 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> > >Index: lang/ruby25/Makefile >=================================================================== >--- lang/ruby25/Makefile (revision 515742) >+++ 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> > >Index: lang/ruby26/Makefile >=================================================================== >--- lang/ruby26/Makefile (revision 515742) >+++ 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> >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 241473
:
208572
| 208626