aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Mk/bsd.ruby.mk11
-rw-r--r--lang/ruby-devel/distinfo1
-rw-r--r--lang/ruby-devel/pkg-plist2
-rw-r--r--lang/ruby/Makefile4
-rw-r--r--lang/ruby/distinfo3
-rw-r--r--lang/ruby16/Makefile4
-rw-r--r--lang/ruby16/distinfo3
-rw-r--r--lang/ruby16_static/Makefile2
-rw-r--r--lang/ruby18/distinfo1
-rw-r--r--lang/ruby18/pkg-plist2
-rw-r--r--lang/ruby_static/Makefile2
11 files changed, 22 insertions, 13 deletions
diff --git a/Mk/bsd.ruby.mk b/Mk/bsd.ruby.mk
index 6df1ce3dbf72..16c791c9fe1c 100644
--- a/Mk/bsd.ruby.mk
+++ b/Mk/bsd.ruby.mk
@@ -103,16 +103,17 @@ RUBY?= ${LOCALBASE}/bin/${RUBY_NAME}
.if defined(RUBY_VER) && ${RUBY_VER} == 1.7
RUBY_VERSION?= 1.7.2
RUBY_PORT?= lang/ruby${RUBY_R}-devel
-RUBY_DISTVERSION?= ${RUBY_VERSION:R}-2002.05.03
-RUBY_PATCHFILES?= ruby-${RUBY_DISTVERSION}-2002.05.05.diff.bz2
-RUBY_PORTVERSION?= ${RUBY_VERSION}.2002.05.05
+RUBY_DISTVERSION?= ${RUBY_VER}-2002.05.03
+RUBY_PATCHFILES?= ruby-${RUBY_DISTVERSION}-2002.05.05.diff.bz2 \
+ ruby-${RUBY_VER}-2002.05.05-2002.05.23.diff.bz2
+RUBY_PORTVERSION?= ${RUBY_VERSION}.2002.05.23
.else
RUBY_VERSION?= 1.6.7
RUBY_DISTVERSION?= ${RUBY_VERSION}
RUBY_PATCHFILES?= ruby-${RUBY_DISTVERSION}-2002.03.27.diff.bz2 \
ruby-${RUBY_DISTVERSION}-2002.03.27-2002.05.02.diff.bz2 \
- ruby-rb_gc_mark-proto.patch.gz
-RUBY_PORTVERSION?= ${RUBY_VERSION}.2002.05.02p
+ ruby-${RUBY_DISTVERSION}-2002.05.02-2002.05.23.diff.bz2
+RUBY_PORTVERSION?= ${RUBY_VERSION}.2002.05.23
.endif
# defined(RUBY_VER) && ${RUBY_VER} == 1.7
diff --git a/lang/ruby-devel/distinfo b/lang/ruby-devel/distinfo
index c5b166aa2372..3a8213c4b194 100644
--- a/lang/ruby-devel/distinfo
+++ b/lang/ruby-devel/distinfo
@@ -1,3 +1,4 @@
MD5 (ruby/ruby-1.7-2002.05.03.tar.bz2) = fe1a844a8749da9baf0410caf17607df
MD5 (ruby/ruby-1.7-2002.05.03-2002.05.05.diff.bz2) = 1a6963586ce1f8500c8be03bb60d18e7
+MD5 (ruby/ruby-1.7-2002.05.05-2002.05.23.diff.bz2) = 27e18354f13987510ab36c6b4d7fdc56
MD5 (ruby/onigd20020424.tar.gz) = d5e6505aa776378a58cdb0fd4ef9cdc0
diff --git a/lang/ruby-devel/pkg-plist b/lang/ruby-devel/pkg-plist
index 82a5b758a6e5..2178db24d360 100644
--- a/lang/ruby-devel/pkg-plist
+++ b/lang/ruby-devel/pkg-plist
@@ -107,6 +107,7 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
%%RUBYLIB%%%%RUBY_LIBDIR%%/uri.rb
%%RUBYLIB%%%%RUBY_LIBDIR%%/weakref.rb
%%RUBYLIB%%%%RUBY_LIBDIR%%/cgi/session.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/date/format.rb
%%RUBYLIB%%%%RUBY_LIBDIR%%/dl/import.rb
%%RUBYLIB%%%%RUBY_LIBDIR%%/dl/struct.rb
%%RUBYLIB%%%%RUBY_LIBDIR%%/dl/types.rb
@@ -160,6 +161,7 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
@unexec rmdir %D/lib/ruby/site_ruby 2>/dev/null || true
@dirrm %%RUBY_ARCHLIBDIR%%
%%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%/cgi
+%%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%/date
%%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%/dl
%%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%/irb/lc/ja
%%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%/irb/lc
diff --git a/lang/ruby/Makefile b/lang/ruby/Makefile
index 38f9ea70c4a1..d7fbb038430a 100644
--- a/lang/ruby/Makefile
+++ b/lang/ruby/Makefile
@@ -27,7 +27,7 @@ MAINTAINER= knu@FreeBSD.org
.if defined(WITH_ONIGURUMA)
ONIGURUMA_MASTER_SITES= ${MASTER_SITE_RUBY}
ONIGURUMA_MASTER_SITE_SUBDIR= contrib
-ONIGURUMA_DISTFILE= onigd20020325.tar.gz
+ONIGURUMA_DISTFILE= onigd20020424.tar.gz
.endif
#USE_BZIP2= yes
@@ -83,7 +83,7 @@ post-extract:
post-patch:
.if defined(WITH_ONIGURUMA)
- ${CP} -f ${WRKDIR}/oniguruma/regex.[ch] ${WRKSRC}/
+ ${CP} -f ${WRKDIR}/oniguruma/*.[ch] ${WRKSRC}/
cd ${WRKSRC}; ${PATCH} < ${WRKDIR}/oniguruma/re.c.166.patch
.endif
${FIND} ${WRKSRC} -name '*.orig' -delete
diff --git a/lang/ruby/distinfo b/lang/ruby/distinfo
index 004f3fea936d..47e8cb713276 100644
--- a/lang/ruby/distinfo
+++ b/lang/ruby/distinfo
@@ -1,4 +1,5 @@
MD5 (ruby/ruby-1.6.7.tar.gz) = 4213d723911ce346717d60256fa925e1
MD5 (ruby/ruby-1.6.7-2002.03.27.diff.bz2) = 11ad3f19357c5e02cc3a3882ca567f98
MD5 (ruby/ruby-1.6.7-2002.03.27-2002.05.02.diff.bz2) = 8f21e3aeaf6de69862b0ce3b3e44b503
-MD5 (ruby/ruby-rb_gc_mark-proto.patch.gz) = e945efdd3b8d2961eb52c1370d84e5cb
+MD5 (ruby/ruby-1.6.7-2002.05.02-2002.05.23.diff.bz2) = a09917ed660deee38aab350ed5a472b3
+MD5 (ruby/onigd20020424.tar.gz) = d5e6505aa776378a58cdb0fd4ef9cdc0
diff --git a/lang/ruby16/Makefile b/lang/ruby16/Makefile
index 38f9ea70c4a1..d7fbb038430a 100644
--- a/lang/ruby16/Makefile
+++ b/lang/ruby16/Makefile
@@ -27,7 +27,7 @@ MAINTAINER= knu@FreeBSD.org
.if defined(WITH_ONIGURUMA)
ONIGURUMA_MASTER_SITES= ${MASTER_SITE_RUBY}
ONIGURUMA_MASTER_SITE_SUBDIR= contrib
-ONIGURUMA_DISTFILE= onigd20020325.tar.gz
+ONIGURUMA_DISTFILE= onigd20020424.tar.gz
.endif
#USE_BZIP2= yes
@@ -83,7 +83,7 @@ post-extract:
post-patch:
.if defined(WITH_ONIGURUMA)
- ${CP} -f ${WRKDIR}/oniguruma/regex.[ch] ${WRKSRC}/
+ ${CP} -f ${WRKDIR}/oniguruma/*.[ch] ${WRKSRC}/
cd ${WRKSRC}; ${PATCH} < ${WRKDIR}/oniguruma/re.c.166.patch
.endif
${FIND} ${WRKSRC} -name '*.orig' -delete
diff --git a/lang/ruby16/distinfo b/lang/ruby16/distinfo
index 004f3fea936d..47e8cb713276 100644
--- a/lang/ruby16/distinfo
+++ b/lang/ruby16/distinfo
@@ -1,4 +1,5 @@
MD5 (ruby/ruby-1.6.7.tar.gz) = 4213d723911ce346717d60256fa925e1
MD5 (ruby/ruby-1.6.7-2002.03.27.diff.bz2) = 11ad3f19357c5e02cc3a3882ca567f98
MD5 (ruby/ruby-1.6.7-2002.03.27-2002.05.02.diff.bz2) = 8f21e3aeaf6de69862b0ce3b3e44b503
-MD5 (ruby/ruby-rb_gc_mark-proto.patch.gz) = e945efdd3b8d2961eb52c1370d84e5cb
+MD5 (ruby/ruby-1.6.7-2002.05.02-2002.05.23.diff.bz2) = a09917ed660deee38aab350ed5a472b3
+MD5 (ruby/onigd20020424.tar.gz) = d5e6505aa776378a58cdb0fd4ef9cdc0
diff --git a/lang/ruby16_static/Makefile b/lang/ruby16_static/Makefile
index f4cdcba1620a..41840cbd3e20 100644
--- a/lang/ruby16_static/Makefile
+++ b/lang/ruby16_static/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ruby_static
PORTVERSION= ${RUBY_PORTVERSION}
-PORTREVISION?= 1
+PORTREVISION?= 0
CATEGORIES= lang ruby ipv6
MASTER_SITES= # none
DISTFILES= # none
diff --git a/lang/ruby18/distinfo b/lang/ruby18/distinfo
index c5b166aa2372..3a8213c4b194 100644
--- a/lang/ruby18/distinfo
+++ b/lang/ruby18/distinfo
@@ -1,3 +1,4 @@
MD5 (ruby/ruby-1.7-2002.05.03.tar.bz2) = fe1a844a8749da9baf0410caf17607df
MD5 (ruby/ruby-1.7-2002.05.03-2002.05.05.diff.bz2) = 1a6963586ce1f8500c8be03bb60d18e7
+MD5 (ruby/ruby-1.7-2002.05.05-2002.05.23.diff.bz2) = 27e18354f13987510ab36c6b4d7fdc56
MD5 (ruby/onigd20020424.tar.gz) = d5e6505aa776378a58cdb0fd4ef9cdc0
diff --git a/lang/ruby18/pkg-plist b/lang/ruby18/pkg-plist
index 82a5b758a6e5..2178db24d360 100644
--- a/lang/ruby18/pkg-plist
+++ b/lang/ruby18/pkg-plist
@@ -107,6 +107,7 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
%%RUBYLIB%%%%RUBY_LIBDIR%%/uri.rb
%%RUBYLIB%%%%RUBY_LIBDIR%%/weakref.rb
%%RUBYLIB%%%%RUBY_LIBDIR%%/cgi/session.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/date/format.rb
%%RUBYLIB%%%%RUBY_LIBDIR%%/dl/import.rb
%%RUBYLIB%%%%RUBY_LIBDIR%%/dl/struct.rb
%%RUBYLIB%%%%RUBY_LIBDIR%%/dl/types.rb
@@ -160,6 +161,7 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
@unexec rmdir %D/lib/ruby/site_ruby 2>/dev/null || true
@dirrm %%RUBY_ARCHLIBDIR%%
%%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%/cgi
+%%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%/date
%%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%/dl
%%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%/irb/lc/ja
%%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%/irb/lc
diff --git a/lang/ruby_static/Makefile b/lang/ruby_static/Makefile
index f4cdcba1620a..41840cbd3e20 100644
--- a/lang/ruby_static/Makefile
+++ b/lang/ruby_static/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ruby_static
PORTVERSION= ${RUBY_PORTVERSION}
-PORTREVISION?= 1
+PORTREVISION?= 0
CATEGORIES= lang ruby ipv6
MASTER_SITES= # none
DISTFILES= # none