aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Mk/bsd.ruby.mk6
-rw-r--r--lang/ruby-devel/Makefile5
-rw-r--r--lang/ruby-devel/distinfo2
-rw-r--r--lang/ruby-devel/pkg-plist2
-rw-r--r--lang/ruby18/Makefile5
-rw-r--r--lang/ruby18/distinfo2
-rw-r--r--lang/ruby18/pkg-plist2
7 files changed, 13 insertions, 11 deletions
diff --git a/Mk/bsd.ruby.mk b/Mk/bsd.ruby.mk
index e83a04a18594..b1f1ac916652 100644
--- a/Mk/bsd.ruby.mk
+++ b/Mk/bsd.ruby.mk
@@ -97,13 +97,13 @@ RUBY?= ${LOCALBASE}/bin/${RUBY_NAME}
RUBY_VERSION?= 1.4.6
RUBY_SUFFIX?= ${_RUBY_SUFFIX}
.elif defined(RUBY_VER) && ${RUBY_VER} == 1.7
-RUBY_VERSION?= 1.7.0
+RUBY_VERSION?= 1.7.1
RUBY_SUFFIX?= ${_RUBY_SUFFIX}
RUBY_PORT?= lang/ruby-devel
RUBY_WRKSRC?= ${WRKDIR}/ruby
-RUBY_DISTVERSION?= ${RUBY_VERSION}-alpha-2001.05.26
+RUBY_DISTVERSION?= ${RUBY_VERSION}-alpha-2001.06.01
#RUBY_DISTPATCHVERSION?= ${RUBY_DISTVERSION}-yyyy.mm.dd
-RUBY_PORTVERSION?= ${RUBY_VERSION}.a2001.05.26
+RUBY_PORTVERSION?= ${RUBY_VERSION}.a2001.06.01
.else
RUBY_VERSION?= 1.6.4
RUBY_SUFFIX?= # empty
diff --git a/lang/ruby-devel/Makefile b/lang/ruby-devel/Makefile
index 912596b56963..e9d4e2f87fe1 100644
--- a/lang/ruby-devel/Makefile
+++ b/lang/ruby-devel/Makefile
@@ -7,7 +7,6 @@
PORTNAME= ruby
PORTVERSION= ${RUBY_PORTVERSION}
-PORTREVISION= 1
CATEGORIES= lang ruby ipv6
MASTER_SITES= http://www.ruby-lang.org/~knu/ # ${MASTER_SITE_RUBY}
MASTER_SITE_SUBDIR= ${RUBY_VER}
@@ -33,8 +32,8 @@ CONFIGURE_ARGS= --enable-shared
MAN1= ruby${_RUBY_SUFFIX}.1
MLINKS= ruby${_RUBY_SUFFIX}.1 ruby.1
-.if !defined(WITH_LIBC_R)
-CONFIGURE_ARGS+= --with-libc_r=no
+.if defined(WITH_LIBC_R)
+CONFIGURE_ARGS+= --with-libc_r=yes
.endif
.include <bsd.port.pre.mk>
diff --git a/lang/ruby-devel/distinfo b/lang/ruby-devel/distinfo
index f9d3b2b31ca9..c763179b4836 100644
--- a/lang/ruby-devel/distinfo
+++ b/lang/ruby-devel/distinfo
@@ -1 +1 @@
-MD5 (ruby/ruby-1.7.0-alpha-2001.05.26.tar.gz) = 8974c18f641a9ed67ee68b8dde494b65
+MD5 (ruby/ruby-1.7.1-alpha-2001.06.01.tar.gz) = 17052a3f4c7fbb710db4c41d5ffae96d
diff --git a/lang/ruby-devel/pkg-plist b/lang/ruby-devel/pkg-plist
index d144f88cdfe5..6e2d93d3dafb 100644
--- a/lang/ruby-devel/pkg-plist
+++ b/lang/ruby-devel/pkg-plist
@@ -72,6 +72,8 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
%%RUBY_LIBDIR%%/pstore.rb
%%RUBY_LIBDIR%%/rational.rb
%%RUBY_LIBDIR%%/readbytes.rb
+%%RUBY_LIBDIR%%/resolv-replace.rb
+%%RUBY_LIBDIR%%/resolv.rb
%%RUBY_LIBDIR%%/shell.rb
%%RUBY_LIBDIR%%/shellwords.rb
%%RUBY_LIBDIR%%/singleton.rb
diff --git a/lang/ruby18/Makefile b/lang/ruby18/Makefile
index 912596b56963..e9d4e2f87fe1 100644
--- a/lang/ruby18/Makefile
+++ b/lang/ruby18/Makefile
@@ -7,7 +7,6 @@
PORTNAME= ruby
PORTVERSION= ${RUBY_PORTVERSION}
-PORTREVISION= 1
CATEGORIES= lang ruby ipv6
MASTER_SITES= http://www.ruby-lang.org/~knu/ # ${MASTER_SITE_RUBY}
MASTER_SITE_SUBDIR= ${RUBY_VER}
@@ -33,8 +32,8 @@ CONFIGURE_ARGS= --enable-shared
MAN1= ruby${_RUBY_SUFFIX}.1
MLINKS= ruby${_RUBY_SUFFIX}.1 ruby.1
-.if !defined(WITH_LIBC_R)
-CONFIGURE_ARGS+= --with-libc_r=no
+.if defined(WITH_LIBC_R)
+CONFIGURE_ARGS+= --with-libc_r=yes
.endif
.include <bsd.port.pre.mk>
diff --git a/lang/ruby18/distinfo b/lang/ruby18/distinfo
index f9d3b2b31ca9..c763179b4836 100644
--- a/lang/ruby18/distinfo
+++ b/lang/ruby18/distinfo
@@ -1 +1 @@
-MD5 (ruby/ruby-1.7.0-alpha-2001.05.26.tar.gz) = 8974c18f641a9ed67ee68b8dde494b65
+MD5 (ruby/ruby-1.7.1-alpha-2001.06.01.tar.gz) = 17052a3f4c7fbb710db4c41d5ffae96d
diff --git a/lang/ruby18/pkg-plist b/lang/ruby18/pkg-plist
index d144f88cdfe5..6e2d93d3dafb 100644
--- a/lang/ruby18/pkg-plist
+++ b/lang/ruby18/pkg-plist
@@ -72,6 +72,8 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
%%RUBY_LIBDIR%%/pstore.rb
%%RUBY_LIBDIR%%/rational.rb
%%RUBY_LIBDIR%%/readbytes.rb
+%%RUBY_LIBDIR%%/resolv-replace.rb
+%%RUBY_LIBDIR%%/resolv.rb
%%RUBY_LIBDIR%%/shell.rb
%%RUBY_LIBDIR%%/shellwords.rb
%%RUBY_LIBDIR%%/singleton.rb