diff options
| -rw-r--r-- | Mk/bsd.ruby.mk | 19 | ||||
| -rw-r--r-- | lang/ruby/Makefile | 7 | ||||
| -rw-r--r-- | lang/ruby/distinfo | 2 | ||||
| -rw-r--r-- | lang/ruby16/Makefile | 7 | ||||
| -rw-r--r-- | lang/ruby16/distinfo | 2 |
5 files changed, 21 insertions, 16 deletions
diff --git a/Mk/bsd.ruby.mk b/Mk/bsd.ruby.mk index 58ad303aff2c..572d2eb9ee5b 100644 --- a/Mk/bsd.ruby.mk +++ b/Mk/bsd.ruby.mk @@ -38,6 +38,9 @@ Ruby_Include_MAINTAINER= knu@FreeBSD.org # RUBY_VERSION_CODE - Full integer version of ruby without preview/beta suffix in the form of `xyz'. # RUBY_PORTVERSION - PORTVERSION for the standard ruby ports (ruby, ruby-gdbm, etc.). # 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_DISTVER - Same as RUBY_DISTVERSION, but converted into PORTVERSION style (preview -> .p etc.) +# RUBY_SNAPSHOTVERSION - Snapshot version. Mostly it is a date. # RUBY_WRKSRC - WRKSRC for the ruby port. # # RUBY_SHLIBVER - Major version of libruby (see below for current value). @@ -96,21 +99,17 @@ RUBY_VERSION?= 1.6.4 RUBY_SUFFIX?= # empty .endif -RUBY_SNAPSHOTVERSION= preview1 -RUBY_SNAPSHOTVER= ${RUBY_SNAPSHOTVERSION:S/preview/p/} +RUBY_DISTVERSION?= ${RUBY_VERSION}-preview1 +RUBY_SNAPSHOTVERSION?= 2001.04.11 +RUBY_DISTVER= ${RUBY_DISTVERSION:S/-preview/.p/} .if !defined(RUBY_SNAPSHOTVERSION) || empty(RUBY_SNAPSHOTVERSION) -RUBY_PORTVERSION= ${RUBY_VERSION} +RUBY_PORTVERSION= ${RUBY_DISTVER} .else -RUBY_PORTVERSION= ${RUBY_VERSION}.${RUBY_SNAPSHOTVER} - -.if ${RUBY_SNAPSHOTVERSION} != ${RUBY_SNAPSHOTVER} -# preview release -RUBY_DISTNAME?= ruby-${RUBY_VERSION}-${RUBY_SNAPSHOTVERSION} -.endif +RUBY_PORTVERSION= ${RUBY_DISTVER}.${RUBY_SNAPSHOTVERSION} .endif -RUBY_DISTNAME?= ruby-${RUBY_VERSION} +RUBY_DISTNAME?= ruby-${RUBY_DISTVERSION} RUBY_WRKSRC?= ${WRKDIR}/ruby-${RUBY_VERSION} diff --git a/lang/ruby/Makefile b/lang/ruby/Makefile index decfea285c7f..6ebadae92225 100644 --- a/lang/ruby/Makefile +++ b/lang/ruby/Makefile @@ -13,9 +13,10 @@ MASTER_SITE_SUBDIR= ${RUBY_VER} DISTNAME= ${RUBY_DISTNAME} DIST_SUBDIR= ruby -#PATCH_SITES= http://www.ruby-lang.org/~knu/ -#PATCHFILES= ${RUBY_DISTNAME}-${RUBY_SNAPSHOTVERSION}.patch.gz -#PATCH_DIST_STRIP= -p1 +PATCH_SITES= http://www.ruby-lang.org/~knu/ +PATCHFILES= ${RUBY_DISTNAME}-${RUBY_SNAPSHOTVERSION}.patch.gz \ + ruby-malloc_race.patch.gz +PATCH_DIST_STRIP= -p1 MAINTAINER= knu@FreeBSD.org diff --git a/lang/ruby/distinfo b/lang/ruby/distinfo index e3f55c5b85a0..12472eaacd4b 100644 --- a/lang/ruby/distinfo +++ b/lang/ruby/distinfo @@ -1 +1,3 @@ MD5 (ruby/ruby-1.6.4-preview1.tar.gz) = 68652977db09717eb3740c33c6f1fb24 +MD5 (ruby/ruby-1.6.4-preview1-2001.04.11.patch.gz) = dff4c52ab7458f091b2ae219842bcfd5 +MD5 (ruby/ruby-malloc_race.patch.gz) = 7c74ae36d8ba0db8b29aa0d7ac6fffcb diff --git a/lang/ruby16/Makefile b/lang/ruby16/Makefile index decfea285c7f..6ebadae92225 100644 --- a/lang/ruby16/Makefile +++ b/lang/ruby16/Makefile @@ -13,9 +13,10 @@ MASTER_SITE_SUBDIR= ${RUBY_VER} DISTNAME= ${RUBY_DISTNAME} DIST_SUBDIR= ruby -#PATCH_SITES= http://www.ruby-lang.org/~knu/ -#PATCHFILES= ${RUBY_DISTNAME}-${RUBY_SNAPSHOTVERSION}.patch.gz -#PATCH_DIST_STRIP= -p1 +PATCH_SITES= http://www.ruby-lang.org/~knu/ +PATCHFILES= ${RUBY_DISTNAME}-${RUBY_SNAPSHOTVERSION}.patch.gz \ + ruby-malloc_race.patch.gz +PATCH_DIST_STRIP= -p1 MAINTAINER= knu@FreeBSD.org diff --git a/lang/ruby16/distinfo b/lang/ruby16/distinfo index e3f55c5b85a0..12472eaacd4b 100644 --- a/lang/ruby16/distinfo +++ b/lang/ruby16/distinfo @@ -1 +1,3 @@ MD5 (ruby/ruby-1.6.4-preview1.tar.gz) = 68652977db09717eb3740c33c6f1fb24 +MD5 (ruby/ruby-1.6.4-preview1-2001.04.11.patch.gz) = dff4c52ab7458f091b2ae219842bcfd5 +MD5 (ruby/ruby-malloc_race.patch.gz) = 7c74ae36d8ba0db8b29aa0d7ac6fffcb |