3 files changed, 31 insertions, 15 deletions

diff --git a/devel/ruby-optparse/Makefile b/devel/ruby-optparse/Makefile
index 640e4e8c6909..e50a11493448 100644
--- a/devel/ruby-optparse/Makefile
+++ b/devel/ruby-optparse/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	optparse
-PORTVERSION=	0.7.9
+PORTVERSION=	0.7.10
 CATEGORIES=	devel ruby
 MASTER_SITES=	http://member.nifty.ne.jp/nokada/archive/
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
@@ -18,25 +18,36 @@ USE_RUBY=	yes
 
 NO_BUILD=	yes
 
+DOCS_EN=	ChangeLog.html \
+		README.en \
+		optparse.en.rd \
+		optparse.html \
+		optparse.rlog \
+		rmi.html
+DOCS_JA=	FIRSTSTEP.ja.html \
+		FIRSTSTEP.ja.rd \
+		README.ja \
+		optparse.ja.html \
+		optparse.ja.rd
+
 do-install:
-	${MKDIR} ${RUBY_SITELIBDIR}/optparse
-.for f in optparse.rb optparse/shellwords.rb optparse/time.rb optparse/uri.rb
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_SITELIBDIR}/${f}
-.endfor
+	${MKDIR} ${RUBY_SITELIBDIR}/${PORTNAME}
+	${INSTALL_DATA} ${WRKSRC}/optparse.rb ${RUBY_SITELIBDIR}/
+	${INSTALL_DATA} ${WRKSRC}/optparse/*.rb${f} ${RUBY_SITELIBDIR}/${PORTNAME}/
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${RUBY_EXAMPLESDIR}/optparse/ja
-	${MKDIR} ${RUBY_DOCDIR}/optparse/ja
-.for f in ChangeLog README.en optparse.en.rd optparse.rlog
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/optparse/
+	${MKDIR} ${RUBY_EXAMPLESDIR}/${PORTNAME}/ja
+	${MKDIR} ${RUBY_DOCDIR}/${PORTNAME}/ja
+.for f in ${DOCS_EN}
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/${PORTNAME}/
 .endfor
-.for f in README.ja optparse.ja.rd
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/optparse/ja/
+.for f in ${DOCS_JA}
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/${PORTNAME}/ja/
 .endfor
 .for f in cmd-ls.rb cmd.rb getopts.test.en opttest.rb
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_EXAMPLESDIR}/optparse/
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_EXAMPLESDIR}/${PORTNAME}/
 .endfor
 .for f in getopts.test
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_EXAMPLESDIR}/optparse/ja
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_EXAMPLESDIR}/${PORTNAME}/ja
 .endfor
 .endif
 
diff --git a/devel/ruby-optparse/distinfo b/devel/ruby-optparse/distinfo
index 0779864160a6..5a81dd117e8b 100644
--- a/devel/ruby-optparse/distinfo
+++ b/devel/ruby-optparse/distinfo
@@ -1 +1 @@
-MD5 (ruby/optparse-0.7.9.tar.gz) = 96a9f77189d5f26832792c91f4985dc0
+MD5 (ruby/optparse-0.7.10.tar.gz) = 4d0cba906c103623f3723e10a9607b74
diff --git a/devel/ruby-optparse/pkg-plist b/devel/ruby-optparse/pkg-plist
index 4aff9ca67371..8589085ac526 100644
--- a/devel/ruby-optparse/pkg-plist
+++ b/devel/ruby-optparse/pkg-plist
@@ -8,12 +8,17 @@
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/optparse/cmd.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/optparse/getopts.test.en
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/optparse/opttest.rb
+%%PORTDOCS%%%%RUBY_DOCDIR%%/optparse/ja/FIRSTSTEP.ja.html
+%%PORTDOCS%%%%RUBY_DOCDIR%%/optparse/ja/FIRSTSTEP.ja.rd
 %%PORTDOCS%%%%RUBY_DOCDIR%%/optparse/ja/README.ja
+%%PORTDOCS%%%%RUBY_DOCDIR%%/optparse/ja/optparse.ja.html
 %%PORTDOCS%%%%RUBY_DOCDIR%%/optparse/ja/optparse.ja.rd
-%%PORTDOCS%%%%RUBY_DOCDIR%%/optparse/ChangeLog
+%%PORTDOCS%%%%RUBY_DOCDIR%%/optparse/ChangeLog.html
 %%PORTDOCS%%%%RUBY_DOCDIR%%/optparse/README.en
 %%PORTDOCS%%%%RUBY_DOCDIR%%/optparse/optparse.en.rd
+%%PORTDOCS%%%%RUBY_DOCDIR%%/optparse/optparse.html
 %%PORTDOCS%%%%RUBY_DOCDIR%%/optparse/optparse.rlog
+%%PORTDOCS%%%%RUBY_DOCDIR%%/optparse/rmi.html
 %%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/optparse/ja
 %%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/optparse
 %%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/optparse/ja