Update to 0.8.0. Drop the support for Ruby 1.4.

4 files changed, 16 insertions, 17 deletions

diff --git a/www/mod_ruby/Makefile b/www/mod_ruby/Makefile
index 63abbc306bd7..693073da631b 100644
--- a/www/mod_ruby/Makefile
+++ b/www/mod_ruby/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	mod_ruby
-PORTVERSION=	${VERSION}
-PORTREVISION=	1
+PORTVERSION=	0.8.0
 CATEGORIES=	www ruby
 MASTER_SITES=	http://www.modruby.net/archive/
 DIST_SUBDIR=	ruby
@@ -19,15 +18,6 @@ LIB_DEPENDS=	eruby.1:${PORTSDIR}/textproc/eruby
 RUN_DEPENDS=	${APXS}:${PORTSDIR}/www/apache13
 
 USE_RUBY=	yes
-RUBY_REQUIRE=	160 <= Ruby
-
-.include <bsd.port.pre.mk>
-
-.if defined(RUBY_PROVIDED)
-VERSION=	0.2.2
-.else
-VERSION=	0.2.0
-.endif
 
 APXS=		${LOCALBASE}/sbin/apxs
 
@@ -38,14 +28,19 @@ CONFIGURE_ARGS=	--apxs="${APXS}" \
 
 DOCS_EN=	ChangeLog README.en
 DOCS_JA=	README.ja
+EXAMPLES_EN=	ruby/*
 
 do-configure:
-	@cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${RUBY} Makefile.RB ${CONFIGURE_ARGS}
+	@cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${RUBY} ${RUBY_FLAGS} Makefile.RB ${CONFIGURE_ARGS}
 
 do-install:
 	${APXS} -i -n ruby ${WRKSRC}/mod_ruby.so
 	${INSTALL_DATA} ${FILESDIR}/httpd.conf.${PORTNAME} ${PREFIX}/etc/apache/
 .if !defined(NOPORTDOCS)
+	${MKDIR} ${RUBY_EXAMPLESDIR}/${PORTNAME}
+.for f in ${EXAMPLES_EN}
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_EXAMPLESDIR}/${PORTNAME}/
+.endfor
 	${MKDIR} ${RUBY_DOCDIR}/${PORTNAME}/ja
 .for f in ${DOCS_EN}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/${PORTNAME}/
@@ -56,4 +51,4 @@ do-install:
 .endif
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/mod_ruby/distinfo b/www/mod_ruby/distinfo
index 53560af3e81a..35a9ede0800d 100644
--- a/www/mod_ruby/distinfo
+++ b/www/mod_ruby/distinfo
@@ -1,2 +1 @@
-MD5 (ruby/mod_ruby-0.2.0.tar.gz) = 816feff73fcabbc4bb75e5c17919bc3e
-MD5 (ruby/mod_ruby-0.2.2.tar.gz) = aacb7ac1f687b8b31f646cb7a8f9190e
+MD5 (ruby/mod_ruby-0.8.0.tar.gz) = add848e7750b23944d2c36e542acbfee
diff --git a/www/mod_ruby/files/httpd.conf.mod_ruby b/www/mod_ruby/files/httpd.conf.mod_ruby
index a4e24b799b46..99563e984790 100644
--- a/www/mod_ruby/files/httpd.conf.mod_ruby
+++ b/www/mod_ruby/files/httpd.conf.mod_ruby
@@ -9,9 +9,12 @@ LoadModule ruby_module     libexec/apache/mod_ruby.so
 AddModule mod_ruby.c
 
 <IfModule mod_ruby.c>
-    AddHandler ruby-script	.rb
+    AddHandler ruby-script	.rbx
+    AddType application/x-httpd-eruby .rhtml
 
-#    Alias /ruby/ /usr/local/www/cgi-bin/
+    #RubyKanjiCode euc
+
+#    Alias /ruby/ /usr/local/www/ruby/
 #    <Location /ruby/>
 #        SetHandler ruby-script
 #        Options ExecCGI
diff --git a/www/mod_ruby/pkg-plist b/www/mod_ruby/pkg-plist
index 6ab5f8031a73..760241f35aa2 100644
--- a/www/mod_ruby/pkg-plist
+++ b/www/mod_ruby/pkg-plist
@@ -1,5 +1,7 @@
 etc/apache/httpd.conf.mod_ruby
 libexec/apache/mod_ruby.so
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/mod_ruby/mod_rd2html.rb
+%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/mod_ruby
 %%PORTDOCS%%%%RUBY_DOCDIR%%/mod_ruby/ChangeLog
 %%PORTDOCS%%%%RUBY_DOCDIR%%/mod_ruby/README.en
 %%PORTDOCS%%%%RUBY_DOCDIR%%/mod_ruby/ja/README.ja