aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Mk/bsd.ruby.mk34
-rw-r--r--lang/ruby-devel/Makefile9
-rw-r--r--lang/ruby-devel/distinfo5
-rw-r--r--lang/ruby-devel/pkg-plist8
-rw-r--r--lang/ruby/Makefile8
-rw-r--r--lang/ruby/distinfo4
-rw-r--r--lang/ruby16-shim-ruby18/Makefile8
-rw-r--r--lang/ruby16-shim-ruby18/distinfo2
-rw-r--r--lang/ruby16-shim-ruby18/pkg-plist8
-rw-r--r--lang/ruby16/Makefile8
-rw-r--r--lang/ruby16/distinfo4
-rw-r--r--lang/ruby18/Makefile9
-rw-r--r--lang/ruby18/distinfo5
-rw-r--r--lang/ruby18/pkg-plist8
14 files changed, 66 insertions, 54 deletions
diff --git a/Mk/bsd.ruby.mk b/Mk/bsd.ruby.mk
index 016cdab2b593..aa3e7197a327 100644
--- a/Mk/bsd.ruby.mk
+++ b/Mk/bsd.ruby.mk
@@ -15,7 +15,7 @@ Ruby_Include_MAINTAINER= knu@FreeBSD.org
# [variables that a user may define]
#
# RUBY_VER - (See below)
-# RUBY_DEFAULT_VER - Set to (e.g.) "1.7" if you want to refer to "ruby17" just as "ruby".
+# RUBY_DEFAULT_VER - Set to (e.g.) "1.8" if you want to refer to "ruby18" just as "ruby".
# RUBY_ARCH - (See below)
# RUBY_NO_RD_HTML - Define if you don't want HTML files generated from RD files.
#
@@ -97,7 +97,7 @@ Ruby_Include_MAINTAINER= knu@FreeBSD.org
#
#.if ${ARCH} == alpha || ${ARCH} == sparc64
-#RUBY_VER?= 1.7
+#RUBY_VER?= 1.8
#.endif
.if defined(RUBY)
@@ -123,22 +123,25 @@ _RUBY_SITEDIR!= ${_RUBY_CONFIG} 'puts C["sitedir"]'
.else
RUBY?= ${LOCALBASE}/bin/${RUBY_NAME}
-.if defined(RUBY_VER) && ${RUBY_VER} == 1.7
-RUBY_VERSION?= 1.7.3
+.if defined(RUBY_VER) && ${RUBY_VER} == 1.8
+RUBY_VERSION?= 1.8.0
RUBY_PORT?= lang/ruby${RUBY_R}-devel
-RUBY_DISTVERSION?= ${RUBY_VERSION}-2002.12.12
-#RUBY_PATCHFILES?= ruby-${RUBY_DISTVERSION}-yyyy.mm.dd.diff.bz2
-RUBY_PORTVERSION?= ${RUBY_VERSION}.2002.12.12
-MASTER_SITE_SUBDIR_RUBY= snapshots
+RUBY_DISTVERSION?= ${RUBY_VERSION}-preview1
+RUBY_PATCHFILES?= ruby-${RUBY_DISTVERSION}-errata.diff
+RUBY_PORTVERSION?= ${RUBY_VERSION}.p1
+RUBY_WRKSRC= ${WRKDIR}/ruby-${RUBY_VERSION}
+#MASTER_SITE_SUBDIR_RUBY= snapshots
+.elif defined(RUBY_VER) && ${RUBY_VER} == 1.7
+.error "Ruby 1.7 is obsolete; set RUBY_VER to 1.8 instead."
.else
RUBY_VERSION?= 1.6.8
-RUBY_DISTVERSION?= ${RUBY_VERSION}-preview3
+#RUBY_DISTVERSION?= ${RUBY_VERSION}
#RUBY_PATCHFILES?= ruby-${RUBY_DISTVERSION}-yyyy.mm.dd.diff.bz2
-RUBY_PORTVERSION?= ${RUBY_VERSION}.p3
-RUBY_WRKSRC= ${WRKDIR}/ruby-${RUBY_VERSION}
-MASTER_SITE_SUBDIR_RUBY= ${RUBY_VER}
+#RUBY_PORTVERSION?= ${RUBY_VERSION}
+#RUBY_WRKSRC= ${WRKDIR}/ruby-${RUBY_VERSION}
+#MASTER_SITE_SUBDIR_RUBY= snapshots
.endif
-# defined(RUBY_VER) && ${RUBY_VER} == 1.7
+# defined(RUBY_VER) && ${RUBY_VER} == 1.8
RUBY_ARCH?= ${ARCH}-freebsd${OSREL:C/\..*//}${RUBY_R}
RUBY_NAME?= ruby${RUBY_SUFFIX}
@@ -149,7 +152,7 @@ _RUBY_SITEDIR?= ${_RUBY_SYSLIBDIR}/ruby/site_ruby
# defined(RUBY)
#.if ${ARCH} == alpha || ${ARCH} == sparc64
-#RUBY_DEFAULT_VER?= 1.7
+#RUBY_DEFAULT_VER?= 1.8
#.else
RUBY_DEFAULT_VER?= 1.6
#.endif
@@ -157,6 +160,7 @@ RUBY_DEFAULT_SUFFIX?= ${RUBY_DEFAULT_VER:S/.//}
RUBY_DISTVERSION?= ${RUBY_VERSION}
RUBY_PORTVERSION?= ${RUBY_VERSION}
+MASTER_SITE_SUBDIR_RUBY?= ${RUBY_VER}
RUBY_DISTNAME?= ruby-${RUBY_DISTVERSION}
RUBY_WRKSRC?= ${WRKDIR}/${RUBY_DISTNAME}
@@ -383,7 +387,7 @@ shim= ${USE_RUBY_FEATURES:Mbenchmark} \
${USE_RUBY_FEATURES:Mstringio} \
${USE_RUBY_FEATURES:Mstrscan} \
${USE_RUBY_FEATURES:Mtsort}
-.if !empty(shim) && ${RUBY_VER} < 1.7
+.if !empty(shim) && ${RUBY_VER} <= 1.6
BUILD_DEPENDS+= ${DEPEND_RUBY_SHIM18}
RUN_DEPENDS+= ${DEPEND_RUBY_SHIM18}
.endif
diff --git a/lang/ruby-devel/Makefile b/lang/ruby-devel/Makefile
index d919b28864e2..df64904de83c 100644
--- a/lang/ruby-devel/Makefile
+++ b/lang/ruby-devel/Makefile
@@ -27,15 +27,15 @@ MAINTAINER= knu@FreeBSD.org
.if defined(WITH_ONIGURUMA)
ONIGURUMA_MASTER_SITES= ${MASTER_SITE_RUBY}
ONIGURUMA_MASTER_SITE_SUBDIR= contrib
-ONIGURUMA_DISTFILE= onigd20020424.tar.gz
+ONIGURUMA_DISTFILE= onigd20021210.tar.gz
PLIST_SUB+= ONIGURUMA=""
.else
PLIST_SUB+= ONIGURUMA="@comment "
.endif
-USE_BZIP2= yes
+#USE_BZIP2= yes
-RUBY_VER= 1.7
+RUBY_VER= 1.8
USE_RUBY= yes
RUBY_NO_BUILD_DEPENDS= yes
@@ -97,6 +97,7 @@ OBSOLETED_MODULES= dl \
uri
post-extract:
+ ${RMDIR} ${WRKSRC}/doc/net
${MV} ${WRKSRC}/ext/dl/h2rb ${WRKSRC}/bin/
.if defined(WITH_ONIGURUMA)
${TAR} -zxvf ${DISTDIR}/${DIST_SUBDIR}/${ONIGURUMA_DISTFILE} -C ${WRKDIR}
@@ -120,7 +121,7 @@ post-install:
${STRIP_CMD} ${RUBY}
.endif
.if ${RUBY_VER} == ${RUBY_DEFAULT_VER}
-# Link just installed "ruby" to "ruby17", etc.
+# Link just installed "ruby" to "ruby18", etc.
${LN} -f ${RUBY_WITHOUT_SUFFIX}${RUBY_R} ${RUBY_WITH_SUFFIX}
${LN} -f ${PREFIX}/man/man1/ruby${RUBY_R}.1 ${PREFIX}/man/man1/ruby${_RUBY_SUFFIX}.1
for f in ${INSTALLED_SCRIPTS}; do \
diff --git a/lang/ruby-devel/distinfo b/lang/ruby-devel/distinfo
index 49443af3684c..5df437bd4211 100644
--- a/lang/ruby-devel/distinfo
+++ b/lang/ruby-devel/distinfo
@@ -1,2 +1,3 @@
-MD5 (ruby/ruby-1.7.3-2002.12.12.tar.bz2) = d200f52d1f7c3a624408b2ebabc66823
-MD5 (ruby/onigd20020424.tar.gz) = d5e6505aa776378a58cdb0fd4ef9cdc0
+MD5 (ruby/ruby-1.8.0-preview1.tar.gz) = 1c37ec680b91cbea7a343252e4bd1e8d
+MD5 (ruby/ruby-1.8.0-preview1-errata.diff) = 7ae6289348c59ca5107064cc75edc64e
+MD5 (ruby/onigd20021210.tar.gz) = 941d1d963de7eb9455a1874449679950
diff --git a/lang/ruby-devel/pkg-plist b/lang/ruby-devel/pkg-plist
index eed68d9ec8ab..ce29108198b8 100644
--- a/lang/ruby-devel/pkg-plist
+++ b/lang/ruby-devel/pkg-plist
@@ -64,15 +64,14 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
%%RUBYLIB%%%%RUBY_LIBDIR%%/eregex.rb
%%RUBYLIB%%%%RUBY_LIBDIR%%/expect.rb
%%RUBYLIB%%%%RUBY_LIBDIR%%/fileutils.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/final.rb
%%RUBYLIB%%%%RUBY_LIBDIR%%/finalize.rb
%%RUBYLIB%%%%RUBY_LIBDIR%%/find.rb
%%RUBYLIB%%%%RUBY_LIBDIR%%/forwardable.rb
%%RUBYLIB%%%%RUBY_LIBDIR%%/ftools.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/ftplib.rb
%%RUBYLIB%%%%RUBY_LIBDIR%%/getoptlong.rb
%%RUBYLIB%%%%RUBY_LIBDIR%%/getopts.rb
%%RUBYLIB%%%%RUBY_LIBDIR%%/importenv.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/ipaddr.rb
%%RUBYLIB%%%%RUBY_LIBDIR%%/irb.rb
%%RUBYLIB%%%%RUBY_LIBDIR%%/jcode.rb
%%RUBYLIB%%%%RUBY_LIBDIR%%/kconv.rb
@@ -84,6 +83,7 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
%%RUBYLIB%%%%RUBY_LIBDIR%%/monitor.rb
%%RUBYLIB%%%%RUBY_LIBDIR%%/mutex_m.rb
%%RUBYLIB%%%%RUBY_LIBDIR%%/observer.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/open-uri.rb
%%RUBYLIB%%%%RUBY_LIBDIR%%/open3.rb
%%RUBYLIB%%%%RUBY_LIBDIR%%/optparse.rb
%%RUBYLIB%%%%RUBY_LIBDIR%%/ostruct.rb
@@ -104,7 +104,6 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
%%RUBYLIB%%%%RUBY_LIBDIR%%/shellwords.rb
%%RUBYLIB%%%%RUBY_LIBDIR%%/singleton.rb
%%RUBYLIB%%%%RUBY_LIBDIR%%/sync.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/telnet.rb
%%RUBYLIB%%%%RUBY_LIBDIR%%/tempfile.rb
%%RUBYLIB%%%%RUBY_LIBDIR%%/thread.rb
%%RUBYLIB%%%%RUBY_LIBDIR%%/thwait.rb
@@ -222,8 +221,6 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
%%PORTDOCS%%%%RUBY_DOCDIR%%/irb/irb-tools.rd.ja
%%PORTDOCS%%%%RUBY_DOCDIR%%/irb/irb.rd
%%PORTDOCS%%%%RUBY_DOCDIR%%/irb/irb.rd.ja
-%%PORTDOCS%%%%RUBY_DOCDIR%%/net/http.rd.ja
-%%PORTDOCS%%%%RUBY_DOCDIR%%/net/smtp.rd.ja
%%PORTDOCS%%%%RUBY_DOCDIR%%/pty/README
%%PORTDOCS%%%%RUBY_DOCDIR%%/pty/README.ja
%%PORTDOCS%%%%RUBY_DOCDIR%%/pty/README.expect
@@ -235,7 +232,6 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/dl
%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/etc
%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/irb
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/net
%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/pty
%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/readline
%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/syslog
diff --git a/lang/ruby/Makefile b/lang/ruby/Makefile
index e17bcabb2967..6781d8c532d4 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= onigd20020424.tar.gz
+ONIGURUMA_DISTFILE= onigd20021210.tar.gz
PLIST_SUB+= ONIGURUMA=""
.else
PLIST_SUB+= ONIGURUMA="@comment "
@@ -44,6 +44,12 @@ GNU_CONFIGURE= yes
WRKSRC= ${RUBY_WRKSRC}
CONFIGURE_ARGS= ${RUBY_CONFIGURE_ARGS} \
--enable-shared
+
+.if defined(DEBUG)
+CFLAGS+= -g
+STRIP= # none
+.endif
+
MAKE_ARGS= -j3
INSTALLS_SHLIB= yes
MAN1= ruby${_RUBY_SUFFIX}.1
diff --git a/lang/ruby/distinfo b/lang/ruby/distinfo
index f56d489e170b..434239d5d5a5 100644
--- a/lang/ruby/distinfo
+++ b/lang/ruby/distinfo
@@ -1,2 +1,2 @@
-MD5 (ruby/ruby-1.6.8-preview3.tar.gz) = 6b8fb98d9e11307b087bcfd4f38b2f6a
-MD5 (ruby/onigd20020424.tar.gz) = d5e6505aa776378a58cdb0fd4ef9cdc0
+MD5 (ruby/ruby-1.6.8.tar.gz) = bf48d49dbd94b5c0eda5f75b3bfbac16
+MD5 (ruby/onigd20021210.tar.gz) = 941d1d963de7eb9455a1874449679950
diff --git a/lang/ruby16-shim-ruby18/Makefile b/lang/ruby16-shim-ruby18/Makefile
index 544a3f2fae29..9e627a3e275b 100644
--- a/lang/ruby16-shim-ruby18/Makefile
+++ b/lang/ruby16-shim-ruby18/Makefile
@@ -6,13 +6,12 @@
#
PORTNAME= shim-ruby18
-PORTVERSION= 1.7.3.2002.12.11
-PORTREVISION= 1
+PORTVERSION= 1.8.0.p1
CATEGORIES= lang devel ruby
MASTER_SITES= ${MASTER_SITE_RUBY}
MASTER_SITE_SUBDIR= shim
PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX}
-DISTNAME= shim-ruby16_18-${PORTVERSION}
+DISTNAME= shim-ruby16_18-${PORTVERSION:S/.p/-preview/}
DIST_SUBDIR= ruby
MAINTAINER= knu@FreeBSD.org
@@ -42,9 +41,6 @@ INSTALLED_SCRIPTS= ${PREFIX}/bin/erb \
PLIST_SUB+= IF_DEFAULT=${IF_DEFAULT} \
-post-extract:
- ${MV} ${WRKSRC}/ext/dl/h2rb ${WRKSRC}/bin/
-
pre-install:
${SETENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
diff --git a/lang/ruby16-shim-ruby18/distinfo b/lang/ruby16-shim-ruby18/distinfo
index a39230c5c5a0..dc2d999cc2f3 100644
--- a/lang/ruby16-shim-ruby18/distinfo
+++ b/lang/ruby16-shim-ruby18/distinfo
@@ -1 +1 @@
-MD5 (ruby/shim-ruby16_18-1.7.3.2002.12.11.tar.bz2) = 66b2e02c5d64b4c684d0e0ff39039d65
+MD5 (ruby/shim-ruby16_18-1.8.0-preview1.tar.bz2) = 10ecf43f6f6283895e899ba787443900
diff --git a/lang/ruby16-shim-ruby18/pkg-plist b/lang/ruby16-shim-ruby18/pkg-plist
index 6c01d4069af0..831c61ddbc2b 100644
--- a/lang/ruby16-shim-ruby18/pkg-plist
+++ b/lang/ruby16-shim-ruby18/pkg-plist
@@ -44,6 +44,9 @@ bin/h2rb%%_RUBY_SUFFIX%%
%%RUBY_SITELIBDIR%%/optparse/time.rb
%%RUBY_SITELIBDIR%%/optparse/uri.rb
@dirrm %%RUBY_SITELIBDIR%%/optparse
+@comment pp
+%%RUBY_SITELIBDIR%%/pp.rb
+%%RUBY_SITELIBDIR%%/prettyprint.rb
@comment racc-runtime
%%RUBY_SITEARCHLIBDIR%%/racc/cparse.so
@dirrm %%RUBY_SITEARCHLIBDIR%%/racc
@@ -55,8 +58,9 @@ bin/h2rb%%_RUBY_SUFFIX%%
%%RUBY_SITEARCHLIBDIR%%/strscan.so
@comment others
%%RUBY_SITELIBDIR%%/benchmark.rb
+%%RUBY_SITELIBDIR%%/erb.rb
%%RUBY_SITELIBDIR%%/fileutils.rb
-%%RUBY_SITELIBDIR%%/pp.rb
-%%RUBY_SITELIBDIR%%/prettyprint.rb
+%%RUBY_SITELIBDIR%%/ipaddr.rb
+%%RUBY_SITELIBDIR%%/open-uri.rb
%%RUBY_SITELIBDIR%%/set.rb
%%RUBY_SITELIBDIR%%/tsort.rb
diff --git a/lang/ruby16/Makefile b/lang/ruby16/Makefile
index e17bcabb2967..6781d8c532d4 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= onigd20020424.tar.gz
+ONIGURUMA_DISTFILE= onigd20021210.tar.gz
PLIST_SUB+= ONIGURUMA=""
.else
PLIST_SUB+= ONIGURUMA="@comment "
@@ -44,6 +44,12 @@ GNU_CONFIGURE= yes
WRKSRC= ${RUBY_WRKSRC}
CONFIGURE_ARGS= ${RUBY_CONFIGURE_ARGS} \
--enable-shared
+
+.if defined(DEBUG)
+CFLAGS+= -g
+STRIP= # none
+.endif
+
MAKE_ARGS= -j3
INSTALLS_SHLIB= yes
MAN1= ruby${_RUBY_SUFFIX}.1
diff --git a/lang/ruby16/distinfo b/lang/ruby16/distinfo
index f56d489e170b..434239d5d5a5 100644
--- a/lang/ruby16/distinfo
+++ b/lang/ruby16/distinfo
@@ -1,2 +1,2 @@
-MD5 (ruby/ruby-1.6.8-preview3.tar.gz) = 6b8fb98d9e11307b087bcfd4f38b2f6a
-MD5 (ruby/onigd20020424.tar.gz) = d5e6505aa776378a58cdb0fd4ef9cdc0
+MD5 (ruby/ruby-1.6.8.tar.gz) = bf48d49dbd94b5c0eda5f75b3bfbac16
+MD5 (ruby/onigd20021210.tar.gz) = 941d1d963de7eb9455a1874449679950
diff --git a/lang/ruby18/Makefile b/lang/ruby18/Makefile
index d919b28864e2..df64904de83c 100644
--- a/lang/ruby18/Makefile
+++ b/lang/ruby18/Makefile
@@ -27,15 +27,15 @@ MAINTAINER= knu@FreeBSD.org
.if defined(WITH_ONIGURUMA)
ONIGURUMA_MASTER_SITES= ${MASTER_SITE_RUBY}
ONIGURUMA_MASTER_SITE_SUBDIR= contrib
-ONIGURUMA_DISTFILE= onigd20020424.tar.gz
+ONIGURUMA_DISTFILE= onigd20021210.tar.gz
PLIST_SUB+= ONIGURUMA=""
.else
PLIST_SUB+= ONIGURUMA="@comment "
.endif
-USE_BZIP2= yes
+#USE_BZIP2= yes
-RUBY_VER= 1.7
+RUBY_VER= 1.8
USE_RUBY= yes
RUBY_NO_BUILD_DEPENDS= yes
@@ -97,6 +97,7 @@ OBSOLETED_MODULES= dl \
uri
post-extract:
+ ${RMDIR} ${WRKSRC}/doc/net
${MV} ${WRKSRC}/ext/dl/h2rb ${WRKSRC}/bin/
.if defined(WITH_ONIGURUMA)
${TAR} -zxvf ${DISTDIR}/${DIST_SUBDIR}/${ONIGURUMA_DISTFILE} -C ${WRKDIR}
@@ -120,7 +121,7 @@ post-install:
${STRIP_CMD} ${RUBY}
.endif
.if ${RUBY_VER} == ${RUBY_DEFAULT_VER}
-# Link just installed "ruby" to "ruby17", etc.
+# Link just installed "ruby" to "ruby18", etc.
${LN} -f ${RUBY_WITHOUT_SUFFIX}${RUBY_R} ${RUBY_WITH_SUFFIX}
${LN} -f ${PREFIX}/man/man1/ruby${RUBY_R}.1 ${PREFIX}/man/man1/ruby${_RUBY_SUFFIX}.1
for f in ${INSTALLED_SCRIPTS}; do \
diff --git a/lang/ruby18/distinfo b/lang/ruby18/distinfo
index 49443af3684c..5df437bd4211 100644
--- a/lang/ruby18/distinfo
+++ b/lang/ruby18/distinfo
@@ -1,2 +1,3 @@
-MD5 (ruby/ruby-1.7.3-2002.12.12.tar.bz2) = d200f52d1f7c3a624408b2ebabc66823
-MD5 (ruby/onigd20020424.tar.gz) = d5e6505aa776378a58cdb0fd4ef9cdc0
+MD5 (ruby/ruby-1.8.0-preview1.tar.gz) = 1c37ec680b91cbea7a343252e4bd1e8d
+MD5 (ruby/ruby-1.8.0-preview1-errata.diff) = 7ae6289348c59ca5107064cc75edc64e
+MD5 (ruby/onigd20021210.tar.gz) = 941d1d963de7eb9455a1874449679950
diff --git a/lang/ruby18/pkg-plist b/lang/ruby18/pkg-plist
index eed68d9ec8ab..ce29108198b8 100644
--- a/lang/ruby18/pkg-plist
+++ b/lang/ruby18/pkg-plist
@@ -64,15 +64,14 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
%%RUBYLIB%%%%RUBY_LIBDIR%%/eregex.rb
%%RUBYLIB%%%%RUBY_LIBDIR%%/expect.rb
%%RUBYLIB%%%%RUBY_LIBDIR%%/fileutils.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/final.rb
%%RUBYLIB%%%%RUBY_LIBDIR%%/finalize.rb
%%RUBYLIB%%%%RUBY_LIBDIR%%/find.rb
%%RUBYLIB%%%%RUBY_LIBDIR%%/forwardable.rb
%%RUBYLIB%%%%RUBY_LIBDIR%%/ftools.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/ftplib.rb
%%RUBYLIB%%%%RUBY_LIBDIR%%/getoptlong.rb
%%RUBYLIB%%%%RUBY_LIBDIR%%/getopts.rb
%%RUBYLIB%%%%RUBY_LIBDIR%%/importenv.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/ipaddr.rb
%%RUBYLIB%%%%RUBY_LIBDIR%%/irb.rb
%%RUBYLIB%%%%RUBY_LIBDIR%%/jcode.rb
%%RUBYLIB%%%%RUBY_LIBDIR%%/kconv.rb
@@ -84,6 +83,7 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
%%RUBYLIB%%%%RUBY_LIBDIR%%/monitor.rb
%%RUBYLIB%%%%RUBY_LIBDIR%%/mutex_m.rb
%%RUBYLIB%%%%RUBY_LIBDIR%%/observer.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/open-uri.rb
%%RUBYLIB%%%%RUBY_LIBDIR%%/open3.rb
%%RUBYLIB%%%%RUBY_LIBDIR%%/optparse.rb
%%RUBYLIB%%%%RUBY_LIBDIR%%/ostruct.rb
@@ -104,7 +104,6 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
%%RUBYLIB%%%%RUBY_LIBDIR%%/shellwords.rb
%%RUBYLIB%%%%RUBY_LIBDIR%%/singleton.rb
%%RUBYLIB%%%%RUBY_LIBDIR%%/sync.rb
-%%RUBYLIB%%%%RUBY_LIBDIR%%/telnet.rb
%%RUBYLIB%%%%RUBY_LIBDIR%%/tempfile.rb
%%RUBYLIB%%%%RUBY_LIBDIR%%/thread.rb
%%RUBYLIB%%%%RUBY_LIBDIR%%/thwait.rb
@@ -222,8 +221,6 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
%%PORTDOCS%%%%RUBY_DOCDIR%%/irb/irb-tools.rd.ja
%%PORTDOCS%%%%RUBY_DOCDIR%%/irb/irb.rd
%%PORTDOCS%%%%RUBY_DOCDIR%%/irb/irb.rd.ja
-%%PORTDOCS%%%%RUBY_DOCDIR%%/net/http.rd.ja
-%%PORTDOCS%%%%RUBY_DOCDIR%%/net/smtp.rd.ja
%%PORTDOCS%%%%RUBY_DOCDIR%%/pty/README
%%PORTDOCS%%%%RUBY_DOCDIR%%/pty/README.ja
%%PORTDOCS%%%%RUBY_DOCDIR%%/pty/README.expect
@@ -235,7 +232,6 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/dl
%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/etc
%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/irb
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/net
%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/pty
%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/readline
%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/syslog