aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Mk/bsd.ruby.mk7
-rw-r--r--lang/ruby/Makefile4
-rw-r--r--lang/ruby/distinfo2
-rw-r--r--lang/ruby16/Makefile4
-rw-r--r--lang/ruby16/distinfo2
5 files changed, 10 insertions, 9 deletions
diff --git a/Mk/bsd.ruby.mk b/Mk/bsd.ruby.mk
index 6973bb1e72af..92c60fd60326 100644
--- a/Mk/bsd.ruby.mk
+++ b/Mk/bsd.ruby.mk
@@ -125,10 +125,11 @@ RUBY_DISTVERSION?= ${RUBY_VERSION}-2002.10.30
#RUBY_PATCHFILES?= ruby-${RUBY_DISTVERSION}-yyyy.mm.dd.diff.bz2
RUBY_PORTVERSION?= ${RUBY_VERSION}.2002.10.30
.else
-RUBY_VERSION?= 1.6.7
-RUBY_DISTVERSION?= ${RUBY_VERSION}-2002.09.12
+RUBY_VERSION?= 1.6.8
+RUBY_DISTVERSION?= ${RUBY_VERSION}-preview1
#RUBY_PATCHFILES?= ruby-${RUBY_DISTVERSION}-yyyy.mm.dd.diff.bz2
-RUBY_PORTVERSION?= ${RUBY_VERSION}.2002.09.12
+RUBY_PORTVERSION?= ${RUBY_VERSION}.p1
+RUBY_WRKSRC= ${WRKDIR}/ruby-${RUBY_VERSION}
.endif
# defined(RUBY_VER) && ${RUBY_VER} == 1.7
diff --git a/lang/ruby/Makefile b/lang/ruby/Makefile
index b2ed31408fd3..bc32a76a00d8 100644
--- a/lang/ruby/Makefile
+++ b/lang/ruby/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= ${RUBY_PORTVERSION}
CATEGORIES= lang ruby ipv6
MASTER_SITES= ${MASTER_SITE_RUBY} \
${ONIGURUMA_MASTER_SITES:S,$,:oniguruma,}
-MASTER_SITE_SUBDIR= snapshots \
+MASTER_SITE_SUBDIR= ${RUBY_VER} \
${ONIGURUMA_MASTER_SITE_SUBDIR:S,$,/:oniguruma,}
DISTFILES= ${RUBY_DISTNAME}${EXTRACT_SUFX} \
${ONIGURUMA_DISTFILE:S,$,:oniguruma,}
@@ -33,7 +33,7 @@ PLIST_SUB+= ONIGURUMA=""
PLIST_SUB+= ONIGURUMA="@comment "
.endif
-USE_BZIP2= yes
+#USE_BZIP2= yes
USE_RUBY= yes
RUBY_NO_BUILD_DEPENDS= yes
diff --git a/lang/ruby/distinfo b/lang/ruby/distinfo
index bc1f6a6a0908..acefaac1d90d 100644
--- a/lang/ruby/distinfo
+++ b/lang/ruby/distinfo
@@ -1,2 +1,2 @@
-MD5 (ruby/ruby-1.6.7-2002.09.12.tar.bz2) = 8910a334deb9d5a1289e2b505ad63511
+MD5 (ruby/ruby-1.6.8-preview1.tar.gz) = c78ecd35155d12484ed15d9eb6c02639
MD5 (ruby/onigd20020424.tar.gz) = d5e6505aa776378a58cdb0fd4ef9cdc0
diff --git a/lang/ruby16/Makefile b/lang/ruby16/Makefile
index b2ed31408fd3..bc32a76a00d8 100644
--- a/lang/ruby16/Makefile
+++ b/lang/ruby16/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= ${RUBY_PORTVERSION}
CATEGORIES= lang ruby ipv6
MASTER_SITES= ${MASTER_SITE_RUBY} \
${ONIGURUMA_MASTER_SITES:S,$,:oniguruma,}
-MASTER_SITE_SUBDIR= snapshots \
+MASTER_SITE_SUBDIR= ${RUBY_VER} \
${ONIGURUMA_MASTER_SITE_SUBDIR:S,$,/:oniguruma,}
DISTFILES= ${RUBY_DISTNAME}${EXTRACT_SUFX} \
${ONIGURUMA_DISTFILE:S,$,:oniguruma,}
@@ -33,7 +33,7 @@ PLIST_SUB+= ONIGURUMA=""
PLIST_SUB+= ONIGURUMA="@comment "
.endif
-USE_BZIP2= yes
+#USE_BZIP2= yes
USE_RUBY= yes
RUBY_NO_BUILD_DEPENDS= yes
diff --git a/lang/ruby16/distinfo b/lang/ruby16/distinfo
index bc1f6a6a0908..acefaac1d90d 100644
--- a/lang/ruby16/distinfo
+++ b/lang/ruby16/distinfo
@@ -1,2 +1,2 @@
-MD5 (ruby/ruby-1.6.7-2002.09.12.tar.bz2) = 8910a334deb9d5a1289e2b505ad63511
+MD5 (ruby/ruby-1.6.8-preview1.tar.gz) = c78ecd35155d12484ed15d9eb6c02639
MD5 (ruby/onigd20020424.tar.gz) = d5e6505aa776378a58cdb0fd4ef9cdc0