Update to 1.3.2. Now mutexm.rb comes with the drb distribution.

3 files changed, 54 insertions, 14 deletions

diff --git a/net/ruby-drb/Makefile b/net/ruby-drb/Makefile
index af02b08f297e..e969982a7c82 100644
--- a/net/ruby-drb/Makefile
+++ b/net/ruby-drb/Makefile
@@ -6,32 +6,56 @@
 #
 
 PORTNAME=	drb
-PORTVERSION=	1.3.1
+PORTVERSION=	1.3.2
 CATEGORIES=	net ruby
-MASTER_SITES=	${MASTER_SITE_RUBY} \
-		http://www2a.biglobe.ne.jp/~seki/ruby/
+MASTER_SITES=	http://www2a.biglobe.ne.jp/~seki/ruby/
 MASTER_SITE_SUBDIR=	contrib
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DIST_SUBDIR=	ruby
 
 MAINTAINER=	knu@FreeBSD.org
 
-# not mandatory, but recommended to use acl with DRb
 RUN_DEPENDS=	${RUBY_SITELIBDIR}/acl.rb:${PORTSDIR}/security/ruby-acl
 
 USE_RUBY=	yes
-
-NO_BUILD=	yes
+.if !defined(NOPORTDOCS)
+USE_RUBY_RD=	yes
+.endif
 
 post-extract:
-	${RM} ${WRKSRC}/lib/acl.rb
+	${MKDIR} ${WRKSRC}/acl/doc ${WRKSRC}/acl/lib ${WRKSRC}/acl/runit
+	cd ${WRKSRC} && for f in */acl*; do ${MV} $$f ${WRKSRC}/acl/$$f; done
+	${MKDIR} ${WRKSRC}/sample/ja
+	${MV} ${WRKSRC}/sample/*.ja ${WRKSRC}/sample/ja/
+
+post-patch:
+.if !defined(NOPORTDOCS)
+	cd ${WRKSRC}/doc && for f in drb-ref.rd*; do \
+		${MV} $$f $$f.orig; \
+		( ${ECHO} '=begin'; ${CAT} $$f.orig; ${ECHO} '=end' ) > $$f; \
+		${RM} $$f.orig; \
+	done
+.endif
+
+do-build:
+.if !defined(NOPORTDOCS)
+	cd ${WRKSRC}/doc && for f in *.rd; do \
+		${RUBY_RD} $$f > `${ECHO} $$f | ${SED} 's/\.rd$$/.html/'`; \
+	done
+	cd ${WRKSRC}/doc && for f in *.rd.ja; do \
+		${RUBY_RD} $$f > `${ECHO} $$f | ${SED} 's/\.rd.ja$$/.ja.html/'`; \
+	done
+	${MKDIR} ${WRKSRC}/doc/ja
+	cd ${WRKSRC}/doc && ${MV} *.rd.ja *.ja.html ja/
+.endif
 
 do-install:
-	@cd ${WRKSRC}; \
-	${RUBY} install.rb
+	${CP} -R ${WRKSRC}/lib/* ${RUBY_SITELIBDIR}/
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${RUBY_EXAMPLESDIR}/drb
-	${INSTALL_DATA} ${WRKSRC}/sample/* ${RUBY_EXAMPLESDIR}/drb
+	${MKDIR} ${RUBY_EXAMPLESDIR}/${PORTNAME}
+	${CP} -R ${WRKSRC}/sample/* ${RUBY_EXAMPLESDIR}/${PORTNAME}/
+	${MKDIR} ${RUBY_DOCDIR}/${PORTNAME}/ja
+	${CP} -R ${WRKSRC}/doc/* ${RUBY_DOCDIR}/${PORTNAME}/
 .endif
 
 .include <bsd.port.mk>
diff --git a/net/ruby-drb/distinfo b/net/ruby-drb/distinfo
index 607c1e5a7743..762a4146d7ef 100644
--- a/net/ruby-drb/distinfo
+++ b/net/ruby-drb/distinfo
@@ -1 +1 @@
-MD5 (ruby/drb-1.3.1.tar.gz) = 155d9d3eb4213b316c1acc5ac11da72d
+MD5 (ruby/drb-1.3.2.tar.gz) = 2641d8078e9750f30a0faca6bcdba16f
diff --git a/net/ruby-drb/pkg-plist b/net/ruby-drb/pkg-plist
index b6e70b8d08c0..47971667bf2d 100644
--- a/net/ruby-drb/pkg-plist
+++ b/net/ruby-drb/pkg-plist
@@ -1,8 +1,13 @@
 %%RUBY_SITELIBDIR%%/drb.rb
+%%RUBY_SITELIBDIR%%/mutexm.rb
+%%RUBY_SITELIBDIR%%/simpletuple.rb
 %%RUBY_SITELIBDIR%%/timerholder.rb
+%%RUBY_SITELIBDIR%%/tuplespace.rb
 %%RUBY_SITELIBDIR%%/drb/drb.rb
+%%RUBY_SITELIBDIR%%/drb/eq.rb
 %%RUBY_SITELIBDIR%%/drb/extserv.rb
 %%RUBY_SITELIBDIR%%/drb/extservm.rb
+%%RUBY_SITELIBDIR%%/drb/rinda.rb
 %%RUBY_SITELIBDIR%%/drb/timeridconv.rb
 @dirrm %%RUBY_SITELIBDIR%%/drb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/drb/darray.rb
@@ -21,9 +26,20 @@
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/drb/drbs-acl.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/drb/drbs.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/drb/extserv_test.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/drb/name.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/drb/holderc.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/drb/holders.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/drb/name.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/drb/namec.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/drb/rinda.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/drb/rindac.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/drb/rindas.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/drb/ja/README.rd.ja
+%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/drb/ja
 %%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/drb
+%%PORTDOCS%%%%RUBY_DOCDIR%%/drb/drb-ref.rd
+%%PORTDOCS%%%%RUBY_DOCDIR%%/drb/drb-ref.html
+%%PORTDOCS%%%%RUBY_DOCDIR%%/drb/ja/drb-ref.rd.ja
+%%PORTDOCS%%%%RUBY_DOCDIR%%/drb/ja/tuplespace-ref.rd.ja
+%%PORTDOCS%%%%RUBY_DOCDIR%%/drb/ja/drb-ref.ja.html
+%%PORTDOCS%%%%RUBY_DOCDIR%%/drb/ja/tuplespace-ref.ja.html
+%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/drb/ja
+%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/drb