Update ruby-drb pacakge to 2.0.4 migrating to use new framework

for Ruby packages.

And mark this package is only for ruby16.  (Ruby 1.8.1 and lator
bundled the same version.)

4 files changed, 63 insertions, 38 deletions

diff --git a/net/ruby-drb/DESCR b/net/ruby-drb/DESCR
index ca742db0911..b49ac549048 100644
--- a/net/ruby-drb/DESCR
+++ b/net/ruby-drb/DESCR
@@ -1,4 +1,2 @@
 druby (DRb) - distributed ruby.
 DRb can be used to exchange messages among Ruby scripts.
-
-Author:	Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
diff --git a/net/ruby-drb/Makefile b/net/ruby-drb/Makefile
index f992a1f6314..fdae8a3e5aa 100644
--- a/net/ruby-drb/Makefile
+++ b/net/ruby-drb/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2004/03/16 02:01:11 taca Exp $
+# $NetBSD: Makefile,v 1.7 2004/11/28 06:10:35 taca Exp $
 # FreeBSD: ports/net/ruby-drb/Makefile,v 1.8 2001/01/18 16:57:25 knu Exp
 
-DISTNAME=	drb-1.3.7
-PKGNAME=	${RUBY_PKGNAMEPREFIX}${DISTNAME}
+DISTNAME=	drb-2.0.4
+PKGNAME=	${RUBY_PKGPREFIX}-${DISTNAME}
 CATEGORIES=	net ruby
 MASTER_SITES=	http://www2a.biglobe.ne.jp/~seki/ruby/
 
@@ -10,37 +10,24 @@ MAINTAINER=	taca@NetBSD.org
 HOMEPAGE=	http://www2a.biglobe.ne.jp/~seki/ruby/
 COMMENT=	Distributed Ruby
 
-DEPENDS+=	${RUBY_PKGNAMEPREFIX}acl>=1.0.1:../../security/ruby-acl
-DEPENDS+=	${RUBY_PKGNAMEPREFIX}mutexm>=1.0.1:../../devel/ruby-mutexm
-
-DIST_SUBDIR=	ruby
-RUBY_REQD=	1.6.5
-USE_RUBY_RD=	# defined
-
-DOCS=		drb-ref.rd drb-ref.rd.ja tuplespace-ref.rd.ja
-
-pre-configure:
-	${RM} -f ${WRKSRC}/doc/acl*
-	${RM} -f ${WRKSRC}/lib/acl.rb
-	${RM} -f ${WRKSRC}/lib/mutexm.rb
-	${RM} -f ${WRKSRC}/runit/acl-test.rb
-	${RM} -f ${WRKSRC}/runit/mutexm_unit.rb
+RUBY_VERSION=		${RUBY16_VERSION}
+USE_RUBY_INSTALL=	yes
+REPLACE_RUBY_DIRS=	sample
+DOCS=			acl-ref.rd acl-ref.rd.ja acl.rd acl.rd.ja \
+			changelog.rd drb-ref.rd drb-ref.rd.ja mutexm.rd.ja \
+			security.rd security.rd.ja tuplespace-ref.rd.ja
 
 do-build:
 .for f in ${DOCS}
 	@cd ${WRKSRC}/doc; ${RUBY_RD} ${f} > ${f:S/.rd/.html/}
 .endfor
 
-do-install:
-	cd ${WRKSRC}; ${RUBY} install.rb
+post-install:
 	${INSTALL_DATA_DIR} ${RUBY_DOCDIR}/drb
-.for f in ${DOCS}
-	${INSTALL_DATA} ${WRKSRC}/doc/${f} ${WRKSRC}/doc/${f:S/.rd/.html/} \
-		${RUBY_DOCDIR}/drb
-.endfor
+	${INSTALL_DATA} ${WRKSRC}/doc/* ${RUBY_DOCDIR}/drb
 	${INSTALL_DATA_DIR} ${RUBY_EXAMPLESDIR}/drb
 	${INSTALL_DATA} ${WRKSRC}/sample/* ${RUBY_EXAMPLESDIR}/drb
 
-.include "../../textproc/ruby-rdtool/Makefile.common"
-.include "../../lang/ruby-base/Makefile.common"
+.include "../../textproc/ruby-rdtool/rdversion.mk"
+.include "../../lang/ruby/modules.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/ruby-drb/PLIST b/net/ruby-drb/PLIST
index 7a175c0cb65..4f10c85e3a4 100644
--- a/net/ruby-drb/PLIST
+++ b/net/ruby-drb/PLIST
@@ -1,26 +1,50 @@
-@comment $NetBSD: PLIST,v 1.2 2002/01/20 06:43:23 taca Exp $
+@comment $NetBSD: PLIST,v 1.3 2004/11/28 06:10:35 taca Exp $
+${RUBY_SITELIBDIR}/acl.rb
 ${RUBY_SITELIBDIR}/drb.rb
 ${RUBY_SITELIBDIR}/drb/drb.rb
 ${RUBY_SITELIBDIR}/drb/eq.rb
 ${RUBY_SITELIBDIR}/drb/extserv.rb
 ${RUBY_SITELIBDIR}/drb/extservm.rb
+${RUBY_SITELIBDIR}/drb/gw.rb
+${RUBY_SITELIBDIR}/drb/invokemethod.rb
+${RUBY_SITELIBDIR}/drb/invokemethod16.rb
 ${RUBY_SITELIBDIR}/drb/observer.rb
-${RUBY_SITELIBDIR}/drb/rinda.rb
+${RUBY_SITELIBDIR}/drb/ssl.rb
 ${RUBY_SITELIBDIR}/drb/timeridconv.rb
+${RUBY_SITELIBDIR}/drb/udp.rb
+${RUBY_SITELIBDIR}/drb/unix.rb
 @dirrm ${RUBY_SITELIBDIR}/drb
-${RUBY_SITELIBDIR}/simpletuple.rb
-${RUBY_SITELIBDIR}/timerholder.rb
-${RUBY_SITELIBDIR}/tuplespace.rb
+${RUBY_SITELIBDIR}/rinda/rinda.rb
+${RUBY_SITELIBDIR}/rinda/ring.rb
+${RUBY_SITELIBDIR}/rinda/tuplespace.rb
+@dirrm ${RUBY_SITELIBDIR}/rinda
+${RUBY_DOCDIR}/drb/acl-ref.html
+${RUBY_DOCDIR}/drb/acl-ref.html.ja
+${RUBY_DOCDIR}/drb/acl-ref.rd
+${RUBY_DOCDIR}/drb/acl-ref.rd.ja
+${RUBY_DOCDIR}/drb/acl.html
+${RUBY_DOCDIR}/drb/acl.html.ja
+${RUBY_DOCDIR}/drb/acl.rd
+${RUBY_DOCDIR}/drb/acl.rd.ja
+${RUBY_DOCDIR}/drb/changelog.html
+${RUBY_DOCDIR}/drb/changelog.rd
 ${RUBY_DOCDIR}/drb/drb-ref.html
 ${RUBY_DOCDIR}/drb/drb-ref.html.ja
 ${RUBY_DOCDIR}/drb/drb-ref.rd
 ${RUBY_DOCDIR}/drb/drb-ref.rd.ja
+${RUBY_DOCDIR}/drb/drbprot.gif
+${RUBY_DOCDIR}/drb/drbprot.obj
+${RUBY_DOCDIR}/drb/mutexm.html.ja
+${RUBY_DOCDIR}/drb/mutexm.rd.ja
+${RUBY_DOCDIR}/drb/security.html
+${RUBY_DOCDIR}/drb/security.html.ja
+${RUBY_DOCDIR}/drb/security.rd
+${RUBY_DOCDIR}/drb/security.rd.ja
 ${RUBY_DOCDIR}/drb/tuplespace-ref.html.ja
 ${RUBY_DOCDIR}/drb/tuplespace-ref.rd.ja
 @dirrm ${RUBY_DOCDIR}/drb
 ${RUBY_EXAMPLESDIR}/drb/README.rd
 ${RUBY_EXAMPLESDIR}/drb/README.rd.ja
-${RUBY_EXAMPLESDIR}/drb/cgi_drb.rb
 ${RUBY_EXAMPLESDIR}/drb/darray.rb
 ${RUBY_EXAMPLESDIR}/drb/darrayc.rb
 ${RUBY_EXAMPLESDIR}/drb/dbiff.rb
@@ -37,16 +61,32 @@ ${RUBY_EXAMPLESDIR}/drb/dqout.rb
 ${RUBY_EXAMPLESDIR}/drb/dqueue.rb
 ${RUBY_EXAMPLESDIR}/drb/drbc.rb
 ${RUBY_EXAMPLESDIR}/drb/drbch.rb
+${RUBY_EXAMPLESDIR}/drb/drbm.rb
+${RUBY_EXAMPLESDIR}/drb/drbmc.rb
 ${RUBY_EXAMPLESDIR}/drb/drbs-acl.rb
 ${RUBY_EXAMPLESDIR}/drb/drbs.rb
+${RUBY_EXAMPLESDIR}/drb/drbssl_c.rb
+${RUBY_EXAMPLESDIR}/drb/drbssl_s.rb
 ${RUBY_EXAMPLESDIR}/drb/extserv_test.rb
+${RUBY_EXAMPLESDIR}/drb/gw_ct.rb
+${RUBY_EXAMPLESDIR}/drb/gw_cu.rb
+${RUBY_EXAMPLESDIR}/drb/gw_s.rb
 ${RUBY_EXAMPLESDIR}/drb/holderc.rb
 ${RUBY_EXAMPLESDIR}/drb/holders.rb
-${RUBY_EXAMPLESDIR}/drb/http.rb
+${RUBY_EXAMPLESDIR}/drb/http0.rb
+${RUBY_EXAMPLESDIR}/drb/http0serv.rb
 ${RUBY_EXAMPLESDIR}/drb/name.rb
 ${RUBY_EXAMPLESDIR}/drb/namec.rb
+${RUBY_EXAMPLESDIR}/drb/old_tuplespace.rb
+${RUBY_EXAMPLESDIR}/drb/rinda_ts.rb
 ${RUBY_EXAMPLESDIR}/drb/rindac.rb
 ${RUBY_EXAMPLESDIR}/drb/rindas.rb
+${RUBY_EXAMPLESDIR}/drb/ring_echo.rb
+${RUBY_EXAMPLESDIR}/drb/ring_inspect.rb
+${RUBY_EXAMPLESDIR}/drb/ring_place.rb
+${RUBY_EXAMPLESDIR}/drb/sample.crt
+${RUBY_EXAMPLESDIR}/drb/sample.key
+${RUBY_EXAMPLESDIR}/drb/simpletuple.rb
 ${RUBY_EXAMPLESDIR}/drb/speedc.rb
 ${RUBY_EXAMPLESDIR}/drb/speeds.rb
 @dirrm ${RUBY_EXAMPLESDIR}/drb
diff --git a/net/ruby-drb/distinfo b/net/ruby-drb/distinfo
index 5c781163435..ae3caa57c5d 100644
--- a/net/ruby-drb/distinfo
+++ b/net/ruby-drb/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2002/09/04 12:59:13 taca Exp $
+$NetBSD: distinfo,v 1.4 2004/11/28 06:10:35 taca Exp $
 
-SHA1 (ruby/drb-1.3.7.tar.gz) = 0c726a74ce415251220ac4d9643ec899ae9e79b6
-Size (ruby/drb-1.3.7.tar.gz) = 29177 bytes
+SHA1 (ruby/drb-2.0.4.tar.gz) = 56cb0b9d1f1e4870f604c95b74c6235cfe60e249
+Size (ruby/drb-2.0.4.tar.gz) = 55458 bytes