diff options
| -rw-r--r-- | Mk/bsd.ruby.mk | 20 | ||||
| -rw-r--r-- | lang/ruby/Makefile | 7 | ||||
| -rw-r--r-- | lang/ruby/distinfo | 4 | ||||
| -rw-r--r-- | lang/ruby16/Makefile | 7 | ||||
| -rw-r--r-- | lang/ruby16/distinfo | 4 |
5 files changed, 22 insertions, 20 deletions
diff --git a/Mk/bsd.ruby.mk b/Mk/bsd.ruby.mk index d40471ba1a4f..58ad303aff2c 100644 --- a/Mk/bsd.ruby.mk +++ b/Mk/bsd.ruby.mk @@ -92,19 +92,27 @@ RUBY?= ${LOCALBASE}/bin/${RUBY_NAME} RUBY_VERSION?= 1.4.6 RUBY_SUFFIX?= ${_RUBY_SUFFIX} .else -RUBY_VERSION?= 1.6.3 +RUBY_VERSION?= 1.6.4 RUBY_SUFFIX?= # empty .endif -RUBY_SNAPSHOTDATE= 2001.04.01 +RUBY_SNAPSHOTVERSION= preview1 +RUBY_SNAPSHOTVER= ${RUBY_SNAPSHOTVERSION:S/preview/p/} -.if defined(RUBY_SNAPSHOTDATE) && !empty(RUBY_SNAPSHOTDATE) -RUBY_PORTVERSION= ${RUBY_VERSION}.${RUBY_SNAPSHOTDATE} -.else +.if !defined(RUBY_SNAPSHOTVERSION) || empty(RUBY_SNAPSHOTVERSION) RUBY_PORTVERSION= ${RUBY_VERSION} +.else +RUBY_PORTVERSION= ${RUBY_VERSION}.${RUBY_SNAPSHOTVER} + +.if ${RUBY_SNAPSHOTVERSION} != ${RUBY_SNAPSHOTVER} +# preview release +RUBY_DISTNAME?= ruby-${RUBY_VERSION}-${RUBY_SNAPSHOTVERSION} .endif +.endif + RUBY_DISTNAME?= ruby-${RUBY_VERSION} -RUBY_WRKSRC?= ${WRKDIR}/${RUBY_DISTNAME} + +RUBY_WRKSRC?= ${WRKDIR}/ruby-${RUBY_VERSION} RUBY_ARCH?= ${ARCH}-freebsd${OSREL} RUBY_NAME?= ruby${RUBY_SUFFIX} diff --git a/lang/ruby/Makefile b/lang/ruby/Makefile index 2de3aef69763..decfea285c7f 100644 --- a/lang/ruby/Makefile +++ b/lang/ruby/Makefile @@ -13,10 +13,9 @@ MASTER_SITE_SUBDIR= ${RUBY_VER} DISTNAME= ${RUBY_DISTNAME} DIST_SUBDIR= ruby -PATCH_SITES= http://www.ruby-lang.org/~knu/ -PATCHFILES= ${PORTNAME}-${RUBY_VERSION}-${RUBY_SNAPSHOTDATE}.patch.gz \ - ${PORTNAME}-freebsd-libc_r.patch.gz -PATCH_DIST_STRIP= -p1 +#PATCH_SITES= http://www.ruby-lang.org/~knu/ +#PATCHFILES= ${RUBY_DISTNAME}-${RUBY_SNAPSHOTVERSION}.patch.gz +#PATCH_DIST_STRIP= -p1 MAINTAINER= knu@FreeBSD.org diff --git a/lang/ruby/distinfo b/lang/ruby/distinfo index 0f7a7ba56720..e3f55c5b85a0 100644 --- a/lang/ruby/distinfo +++ b/lang/ruby/distinfo @@ -1,3 +1 @@ -MD5 (ruby/ruby-1.6.3.tar.gz) = 32a4ac2863806ebae253262c959fde66 -MD5 (ruby/ruby-1.6.3-2001.04.01.patch.gz) = c458dcfc1e4f7152bbd481f8ae96b017 -MD5 (ruby/ruby-freebsd-libc_r.patch.gz) = 3f2cd8f0d627ba2c4d26664c3f1e9a85 +MD5 (ruby/ruby-1.6.4-preview1.tar.gz) = 68652977db09717eb3740c33c6f1fb24 diff --git a/lang/ruby16/Makefile b/lang/ruby16/Makefile index 2de3aef69763..decfea285c7f 100644 --- a/lang/ruby16/Makefile +++ b/lang/ruby16/Makefile @@ -13,10 +13,9 @@ MASTER_SITE_SUBDIR= ${RUBY_VER} DISTNAME= ${RUBY_DISTNAME} DIST_SUBDIR= ruby -PATCH_SITES= http://www.ruby-lang.org/~knu/ -PATCHFILES= ${PORTNAME}-${RUBY_VERSION}-${RUBY_SNAPSHOTDATE}.patch.gz \ - ${PORTNAME}-freebsd-libc_r.patch.gz -PATCH_DIST_STRIP= -p1 +#PATCH_SITES= http://www.ruby-lang.org/~knu/ +#PATCHFILES= ${RUBY_DISTNAME}-${RUBY_SNAPSHOTVERSION}.patch.gz +#PATCH_DIST_STRIP= -p1 MAINTAINER= knu@FreeBSD.org diff --git a/lang/ruby16/distinfo b/lang/ruby16/distinfo index 0f7a7ba56720..e3f55c5b85a0 100644 --- a/lang/ruby16/distinfo +++ b/lang/ruby16/distinfo @@ -1,3 +1 @@ -MD5 (ruby/ruby-1.6.3.tar.gz) = 32a4ac2863806ebae253262c959fde66 -MD5 (ruby/ruby-1.6.3-2001.04.01.patch.gz) = c458dcfc1e4f7152bbd481f8ae96b017 -MD5 (ruby/ruby-freebsd-libc_r.patch.gz) = 3f2cd8f0d627ba2c4d26664c3f1e9a85 +MD5 (ruby/ruby-1.6.4-preview1.tar.gz) = 68652977db09717eb3740c33c6f1fb24 |