4 files changed, 43 insertions, 8 deletions

diff --git a/www/mod_ruby/Makefile b/www/mod_ruby/Makefile
index a4bd60985760..d012ce3b4efe 100644
--- a/www/mod_ruby/Makefile
+++ b/www/mod_ruby/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mod_ruby
-PORTVERSION=	0.9.7
+PORTVERSION=	0.9.8
 CATEGORIES=	www ruby
 MASTER_SITES=	http://www.modruby.net/archive/
 DIST_SUBDIR=	ruby
@@ -18,6 +18,9 @@ LIB_DEPENDS=	eruby.09:${PORTSDIR}/textproc/eruby
 RUN_DEPENDS=	${APXS}:${PORTSDIR}/www/apache13
 
 USE_RUBY=	yes
+.if !defined(NOPORTDOCS)
+USE_RUBY_RD=	yes
+.endif
 
 APXS=		${LOCALBASE}/sbin/apxs
 
@@ -27,12 +30,17 @@ CONFIGURE_ARGS=	--with-apxs="${APXS}" \
 		--with-eruby-libraries="${LOCALBASE}/lib"
 INSTALL_TARGET=	site-install
 
-DOCS_EN=	COPYING ChangeLog README.en
-DOCS_JA=	README.ja
+DOCS_EN=	COPYING ChangeLog README.en doc/default.css doc/*.en.*
+DOCS_JA=	README.ja doc/default.css doc/*.ja.*
 
 do-configure:
 	@cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${RUBY} ${RUBY_FLAGS} configure.rb ${CONFIGURE_ARGS}
 
+post-build:
+.if !defined(NOPORTDOCS)
+	@cd ${WRKSRC}/doc; ${MAKE}
+.endif
+
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/examples/httpd.conf ${PREFIX}/etc/apache/httpd.conf.${PORTNAME}
 .if !defined(NOPORTDOCS)
diff --git a/www/mod_ruby/distinfo b/www/mod_ruby/distinfo
index 9c55f840f601..ea3b9724a8bd 100644
--- a/www/mod_ruby/distinfo
+++ b/www/mod_ruby/distinfo
@@ -1 +1 @@
-MD5 (ruby/mod_ruby-0.9.7.tar.gz) = 542ddd4bee5d5414cb7bb7beb36591a9
+MD5 (ruby/mod_ruby-0.9.8.tar.gz) = da180452759751cd0fe6ae97a4fa7c28
diff --git a/www/mod_ruby/files/patch-httpd.conf b/www/mod_ruby/files/patch-httpd.conf
index e32791ab2e3f..c052e7ef0235 100644
--- a/www/mod_ruby/files/patch-httpd.conf
+++ b/www/mod_ruby/files/patch-httpd.conf
@@ -1,5 +1,10 @@
---- examples/httpd.conf.orig	Mon Jun  4 19:18:11 2001
-+++ examples/httpd.conf	Tue Jun  5 00:49:43 2001
-@@ -1 +1 @@
--LoadModule ruby_module /usr/lib/apache/1.3/mod_ruby.so
+--- examples/httpd.conf.orig	Thu Jun 21 16:50:34 2001
++++ examples/httpd.conf	Tue Apr 23 05:57:33 2002
+@@ -1,6 +1,6 @@
+ # Note: /usr/local/apache/libexec/mod_ruby.so is just an example.
+ #       You should specify the correct path to mod_ruby.so.
+-LoadModule ruby_module /usr/local/apache/libexec/mod_ruby.so
 +LoadModule ruby_module libexec/apache/mod_ruby.so
+ 
+ # # If ClearModuleList is used in your httpd.conf, you should use AddModule
+ # # to activate the ruby module.
diff --git a/www/mod_ruby/pkg-plist b/www/mod_ruby/pkg-plist
index 86fd62688796..9dba7066b180 100644
--- a/www/mod_ruby/pkg-plist
+++ b/www/mod_ruby/pkg-plist
@@ -10,6 +10,28 @@ libexec/apache/mod_ruby.so
 %%PORTDOCS%%%%RUBY_DOCDIR%%/mod_ruby/COPYING
 %%PORTDOCS%%%%RUBY_DOCDIR%%/mod_ruby/ChangeLog
 %%PORTDOCS%%%%RUBY_DOCDIR%%/mod_ruby/README.en
+%%PORTDOCS%%%%RUBY_DOCDIR%%/mod_ruby/classes.en.html
+%%PORTDOCS%%%%RUBY_DOCDIR%%/mod_ruby/classes.en.rd
+%%PORTDOCS%%%%RUBY_DOCDIR%%/mod_ruby/default.css
+%%PORTDOCS%%%%RUBY_DOCDIR%%/mod_ruby/directives.en.html
+%%PORTDOCS%%%%RUBY_DOCDIR%%/mod_ruby/directives.en.rd
+%%PORTDOCS%%%%RUBY_DOCDIR%%/mod_ruby/faq.en.html
+%%PORTDOCS%%%%RUBY_DOCDIR%%/mod_ruby/faq.en.rd
+%%PORTDOCS%%%%RUBY_DOCDIR%%/mod_ruby/index.en.html
+%%PORTDOCS%%%%RUBY_DOCDIR%%/mod_ruby/index.en.rd
+%%PORTDOCS%%%%RUBY_DOCDIR%%/mod_ruby/install.en.html
+%%PORTDOCS%%%%RUBY_DOCDIR%%/mod_ruby/install.en.rd
 %%PORTDOCS%%%%RUBY_DOCDIR%%/mod_ruby/ja/README.ja
+%%PORTDOCS%%%%RUBY_DOCDIR%%/mod_ruby/ja/classes.ja.euc.rd
+%%PORTDOCS%%%%RUBY_DOCDIR%%/mod_ruby/ja/classes.ja.jis.html
+%%PORTDOCS%%%%RUBY_DOCDIR%%/mod_ruby/ja/default.css
+%%PORTDOCS%%%%RUBY_DOCDIR%%/mod_ruby/ja/directives.ja.euc.rd
+%%PORTDOCS%%%%RUBY_DOCDIR%%/mod_ruby/ja/directives.ja.jis.html
+%%PORTDOCS%%%%RUBY_DOCDIR%%/mod_ruby/ja/faq.ja.euc.rd
+%%PORTDOCS%%%%RUBY_DOCDIR%%/mod_ruby/ja/faq.ja.jis.html
+%%PORTDOCS%%%%RUBY_DOCDIR%%/mod_ruby/ja/index.ja.euc.rd
+%%PORTDOCS%%%%RUBY_DOCDIR%%/mod_ruby/ja/index.ja.jis.html
+%%PORTDOCS%%%%RUBY_DOCDIR%%/mod_ruby/ja/install.ja.euc.rd
+%%PORTDOCS%%%%RUBY_DOCDIR%%/mod_ruby/ja/install.ja.jis.html
 %%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/mod_ruby/ja
 %%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/mod_ruby