4 files changed, 37 insertions, 93 deletions

diff --git a/www/ruby-webunit/Makefile b/www/ruby-webunit/Makefile
index 064787ebea06..72cb3356b2ce 100644
--- a/www/ruby-webunit/Makefile
+++ b/www/ruby-webunit/Makefile
@@ -6,44 +6,41 @@
 #
 
 PORTNAME=	webunit
-PORTVERSION=	20020410
+PORTVERSION=	20030121
 CATEGORIES=	www textproc ruby
 MASTER_SITES=	http://www.xpenguin.biz/download/webunit/
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
-DISTNAME=	${PORTNAME}-${PORTVERSION}-alpha
+DISTNAME=	${PORTNAME}-${PORTVERSION}
 DIST_SUBDIR=	ruby
 
 MAINTAINER=	knu@FreeBSD.org
 
-RUN_DEPENDS=	${RUBY_SITELIBDIR}/runit/assert.rb:${PORTSDIR}/devel/ruby-unit \
+RUN_DEPENDS=	${RUBY_SITELIBDIR}/test/unit/testcase.rb:${PORTSDIR}/devel/ruby-testunit \
 		${RUBY_SITELIBDIR}/html-parser.rb:${PORTSDIR}/textproc/ruby-html-parser \
 		${RUBY_SITELIBDIR}/htmlrepair.rb:${PORTSDIR}/textproc/ruby-htmlrepair \
 		${RUBY_SITELIBDIR}/htmlsplit.rb:${PORTSDIR}/textproc/ruby-htmlsplit \
-		${RUBY_SITELIBDIR}/nqxml/info.rb:${PORTSDIR}/textproc/ruby-nqxml
+		${RUBY_SITELIBDIR}/rexml/rexml.rb:${PORTSDIR}/textproc/ruby-rexml
 
 USE_RUBY=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 NO_BUILD=	yes
 
-EXAMPLES_EN=	cgi test sample
-DOCS_EN=	index-en.html
-DOCS_JA=	index-ja.html TIPS-ja.html TODO-ja.sdf
+EXAMPLES=	sample/*
+DOCS=		*.html *.rd
 
 do-install:
-	cd ${WRKSRC}; ${RUBY} install.rb
+	${CP} -R ${WRKSRC}/lib/webunit* ${RUBY_SITELIBDIR}/
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${RUBY_MODEXAMPLESDIR}
-.for f in ${EXAMPLES_EN}
+.for f in ${EXAMPLES}
 	${CP} -R ${WRKSRC}/${f} ${RUBY_MODEXAMPLESDIR}/
 .endfor
 	${MKDIR} ${RUBY_MODDOCDIR}/ja
-.for f in ${DOCS_EN}
+.for f in ${DOCS}
 	${INSTALL_DATA} ${WRKSRC}/doc/${f} ${RUBY_MODDOCDIR}/
 .endfor
-.for f in ${DOCS_JA}
-	${INSTALL_DATA} ${WRKSRC}/doc/${f} ${RUBY_MODDOCDIR}/ja/
-.endfor
+	${MV} ${RUBY_MODDOCDIR}/*-ja.* ${RUBY_MODDOCDIR}/ja/
 .endif
 
 .include <bsd.port.mk>
diff --git a/www/ruby-webunit/distinfo b/www/ruby-webunit/distinfo
index 0fa6551280a9..f8645f8e4f50 100644
--- a/www/ruby-webunit/distinfo
+++ b/www/ruby-webunit/distinfo
@@ -1 +1 @@
-MD5 (ruby/webunit-20020410-alpha.tar.gz) = e6891993564a59132461ba9b77156d15
+MD5 (ruby/webunit-20030121.tar.gz) = e1fd36ec1ff9f5714fab40e2e9c45dcd
diff --git a/www/ruby-webunit/files/patch-install.rb b/www/ruby-webunit/files/patch-install.rb
deleted file mode 100644
index b27edc8ff898..000000000000
--- a/www/ruby-webunit/files/patch-install.rb
+++ /dev/null
@@ -1,20 +0,0 @@
---- install.rb.orig	Thu Jul 26 17:50:49 2001
-+++ install.rb	Thu Sep 20 14:59:29 2001
-@@ -5,7 +5,7 @@
- =end
- 
- require 'rbconfig'
--lib_dir = Config::CONFIG['sitedir']
-+lib_dir = File.join(Config::CONFIG['sitedir'], Config::CONFIG['ruby_version'])
- bin_dir = Config::CONFIG['bindir']
- 
- require 'ftools'
-@@ -23,7 +23,7 @@
-   File::install( path, to, 0644, true )
- }
- 
--%w( html-parser  htmlrepair ).each do |dir|
-+%w(  ).each do |dir|
-   Dir::chdir( BASEDIR + '/contrib/' + dir )
-   system( 'ruby install.rb' )
- end
diff --git a/www/ruby-webunit/pkg-plist b/www/ruby-webunit/pkg-plist
index 32caffdcf2e6..caa30e18bd64 100644
--- a/www/ruby-webunit/pkg-plist
+++ b/www/ruby-webunit/pkg-plist
@@ -1,4 +1,5 @@
 %%RUBY_SITELIBDIR%%/webunit/assert.rb
+%%RUBY_SITELIBDIR%%/webunit/converter.rb
 %%RUBY_SITELIBDIR%%/webunit/cookie.rb
 %%RUBY_SITELIBDIR%%/webunit/domwalker.rb
 %%RUBY_SITELIBDIR%%/webunit/exception.rb
@@ -11,72 +12,38 @@
 %%RUBY_SITELIBDIR%%/webunit/params.rb
 %%RUBY_SITELIBDIR%%/webunit/parser.rb
 %%RUBY_SITELIBDIR%%/webunit/response.rb
+%%RUBY_SITELIBDIR%%/webunit/runtest.rb
 %%RUBY_SITELIBDIR%%/webunit/table.rb
 %%RUBY_SITELIBDIR%%/webunit/testcase.rb
+%%RUBY_SITELIBDIR%%/webunit/ui/cui/testrunner.rb
 %%RUBY_SITELIBDIR%%/webunit/utils.rb
 %%RUBY_SITELIBDIR%%/webunit/webunit.rb
+@dirrm %%RUBY_SITELIBDIR%%/webunit/ui/cui
+@dirrm %%RUBY_SITELIBDIR%%/webunit/ui
 @dirrm %%RUBY_SITELIBDIR%%/webunit
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/cgi/assert.html
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/cgi/auth/.htaccess
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/cgi/auth/.htpasswd
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/cgi/auth/index.html
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/cgi/badtags.html
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/cgi/cookie.cgi
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/cgi/document.xml
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/cgi/form.html
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/cgi/frame-0.html
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/cgi/frame-1.html
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/cgi/frame.html
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/cgi/image.html
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/cgi/images/x.gif
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/cgi/images/y.gif
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/cgi/jscript-0.html
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/cgi/jscript-1.html
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/cgi/jscript.html
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/cgi/link.html
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/cgi/params.html
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/cgi/redirect.cgi
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/cgi/response.html
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/cgi/simple.cgi
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/cgi/stock.cgi
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/cgi/table.html
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/sample/conv/digit-0.cgi
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/sample/conv/digit-0.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/sample/conv/digit-1.cgi
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/sample/conv/digit-1.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/sample/conv/digit.cgi
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/sample/conv/digit.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/sample/conv/test_digit-0.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/sample/conv/test_digit-1.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/sample/conv/test_digit.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/sample/conv/test_digit_view-0.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/sample/conv/test_digit_view-1.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/sample/conv/test_digit_view.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test/test_assert.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test/test_cookie.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test/test_domwalker.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test/test_form.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test/test_frame.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test/test_htmlelem.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test/test_image.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test/test_jscript.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test/test_link.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test/test_params.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test/test_parser.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test/test_response.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test/test_table.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test/test_utils.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test/test_webunit.rb
-%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/test
-%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/sample/conv
-%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/sample
-%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/cgi/images
-%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/cgi/auth
-%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/cgi
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/conv/digit-0.cgi
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/conv/digit-0.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/conv/digit-1.cgi
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/conv/digit-1.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/conv/digit.cgi
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/conv/digit.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/conv/test_digit-0.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/conv/test_digit-1.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/conv/test_digit.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/conv/test_digit_view-0.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/conv/test_digit_view-1.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/conv/test_digit_view.rb
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/conv
 %%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/index-en.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/index-ja.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/index-en.rd
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/changes.rd
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/example.rd
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/TIPS-ja.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/TODO-ja.sdf
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/TIPS-ja.rd
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/TODO-ja.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/TODO-ja.rd
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/index-ja.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/index-ja.rd
 %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/ja
 %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%