Update to 0.2.9.

3 files changed, 56 insertions, 47 deletions

diff --git a/www/ruby-asp/Makefile b/www/ruby-asp/Makefile
index e291d953af3d..1c2b77755dd7 100644
--- a/www/ruby-asp/Makefile
+++ b/www/ruby-asp/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	asp
-PORTVERSION=	0.2.7
+PORTVERSION=	0.2.9
 CATEGORIES=	www ruby
 MASTER_SITES=	http://webtime-project.net/ruby-asp/
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
@@ -18,31 +18,14 @@ COMMENT=	An Active Server Pages port to Apache with Ruby scripting
 
 USE_RUBY=	yes
 USE_RUBY_SETUP=	yes
-RUBY_SETUP=	install.rb
 
 WRKSRC=		${WRKDIR}/ruby-${PORTNAME}
 
-RUBY_RD_FILES=	doc/classes.en.rd \
-		doc/install.en.rd \
-		doc/subsmatch.en.rd \
-		doc/index.en.rd
-
 DOCS=		AUTHORS \
-		README \
-		${RUBY_RD_FILES} \
-		${RUBY_RD_HTML_FILES}
-EXAMPLES=	tests/*
-
-post-build:
-.if !defined(NOPORTDOCS) && defined(RUBY_RD_HTML)
-	cd ${BUILD_WRKSRC}/doc; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS}
-.endif
-
-post-install: doc-install
+		README
+EXAMPLES=	tests tests-cgi
 
-.include <bsd.port.mk>
-
-doc-install:
+post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${RUBY_MODEXAMPLESDIR}
 .for f in ${EXAMPLES}
@@ -53,3 +36,5 @@ doc-install:
 	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/
 .endfor
 .endif
+
+.include <bsd.port.mk>
diff --git a/www/ruby-asp/distinfo b/www/ruby-asp/distinfo
index 49db5716aba9..1d57ab093daa 100644
--- a/www/ruby-asp/distinfo
+++ b/www/ruby-asp/distinfo
@@ -1 +1 @@
-MD5 (ruby/ruby-asp_0.2.7.tar.gz) = 18b0e7e31b409f81d7f33a9ca193994f
+MD5 (ruby/ruby-asp_0.2.9.tar.gz) = c2b19de7e39338ab75f8dfd0bbf78410
diff --git a/www/ruby-asp/pkg-plist b/www/ruby-asp/pkg-plist
index 0f1229282e5d..597cf76a9898 100644
--- a/www/ruby-asp/pkg-plist
+++ b/www/ruby-asp/pkg-plist
@@ -1,4 +1,6 @@
+bin/ruby-asp.rb
 %%RUBY_SITELIBDIR%%/apache/aspruby-run.rb
+%%RUBY_SITELIBDIR%%/asp.rb
 %%RUBY_SITELIBDIR%%/asp/application.rb
 %%RUBY_SITELIBDIR%%/asp/asperror.rb
 %%RUBY_SITELIBDIR%%/asp/common.rb
@@ -13,32 +15,54 @@
 %%RUBY_SITELIBDIR%%/asp/subsmatch.rb
 @dirrm %%RUBY_SITELIBDIR%%/asp
 @dirrm %%RUBY_SITELIBDIR%%/apache
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/cookie.asp
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/default.css
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/error.asp
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/error.html
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/examples.asp
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/global-asa/global.asa
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/global-asa/test.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/index.asp
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/index.html
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/load.asp
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/mod_ruby.png
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/rubyasp-power.png
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/server_variables.asp
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/session.asp
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/simple.asp
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/source.asp
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/subsmatch.asp
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/transfer.asp
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/upload.asp
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/xslt.asp
-%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/global-asa
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/tests-cgi/.htaccess
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/tests-cgi/asp.conf
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/tests-cgi/cookie.casp
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/tests-cgi/default.css
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/tests-cgi/error.casp
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/tests-cgi/error.html
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/tests-cgi/examples.casp
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/tests-cgi/global-asa/global.asa
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/tests-cgi/global-asa/test.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/tests-cgi/index.casp
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/tests-cgi/index.html
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/tests-cgi/load.casp
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/tests-cgi/mod_ruby.png
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/tests-cgi/rubyasp-cgi-power.png
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/tests-cgi/server_variables.casp
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/tests-cgi/session.casp
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/tests-cgi/simple.casp
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/tests-cgi/source.casp
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/tests-cgi/subsmatch.casp
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/tests-cgi/transfer.casp
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/tests-cgi/upload.casp
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/tests-cgi/xslt.casp
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/tests/.htaccess
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/tests/cookie.asp
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/tests/default.css
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/tests/error.asp
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/tests/error.html
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/tests/examples.asp
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/tests/global-asa/global.asa
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/tests/global-asa/test.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/tests/index.asp
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/tests/index.html
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/tests/load.asp
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/tests/mod_ruby.png
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/tests/rubyasp-power.png
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/tests/server_variables.asp
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/tests/session.asp
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/tests/simple.asp
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/tests/source.asp
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/tests/subsmatch.asp
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/tests/transfer.asp
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/tests/upload.asp
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/tests/xslt.asp
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/tests/global-asa
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/tests-cgi/global-asa
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/tests-cgi
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/tests
 %%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/AUTHORS
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/classes.en.rd
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/index.en.rd
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/install.en.rd
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/subsmatch.en.rd
 %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%