Update ruby-webunit package to 20040429++ migrating to use new

framework for Ruby packages.


=== 20040429+ --> 20040429++

* add <area> to SingleTags in parser.html (Thanks to Philip Plumlee)

=== 20040429 --> 20040429+

* fix bug about handling XHTML(like <hr/> tag, in SingleTags at parser.rb)

=== 20040211 --> 20040429

* fit htmlsplit to XHTML(like <p/> tag, it's temporary and defective)

=== 20030121 --> 20040211

* fix for ruby 1.8.1

4 files changed, 21 insertions, 17 deletions

diff --git a/www/ruby-webunit/DESCR b/www/ruby-webunit/DESCR
index 66040258b0d..07128b82f2d 100644
--- a/www/ruby-webunit/DESCR
+++ b/www/ruby-webunit/DESCR
@@ -1,4 +1,3 @@
 WebUnit is Ruby API for testing html/cgi without browser, and is
 ideally suited for automated unit testing of web sites when combined
 with a Ruby unit test framework such as RubyUnit.
-It was designed and implemented by Masaki Suketa.
diff --git a/www/ruby-webunit/Makefile b/www/ruby-webunit/Makefile
index a0ab9cae715..ed1f17b1adf 100644
--- a/www/ruby-webunit/Makefile
+++ b/www/ruby-webunit/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2004/03/16 02:01:11 taca Exp $
+# $NetBSD: Makefile,v 1.4 2004/11/28 05:51:59 taca Exp $
 
 DISTNAME=	webunit-${VERSION}
-PKGNAME=	${RUBY_PKGNAMEPREFIX}${DISTNAME}
+PKGNAME=	${RUBY_PKGPREFIX}-${DISTNAME}
 CATEGORIES=	www textproc ruby
 MASTER_SITES=	http://www.xpenguin.biz/download/webunit/
 
@@ -9,18 +9,27 @@ MAINTAINER=	rasputin@idoru.mine.nu
 HOMEPAGE=	http://www.xpenguin.biz/download/webunit/index-en.html
 COMMENT=	HTTP unit testing framework for Ruby
 
-WRKSRC=		${WRKDIR}/webunit
-VERSION=	20030121
-DIST_SUBDIR=	ruby
 USE_RUBY_SETUP=	yes
 RUBY_SETUP=	install.rb
+WRKSRC=		${WRKDIR}/webunit
+VERSION=	20040429++
+
+.include "../../lang/ruby/rubyversion.mk"
+
+DEPENDS+= ${RUBY_PKGPREFIX}-html-parser>=19990912p1:../../textproc/ruby-html-parser
+DEPENDS+= ${RUBY_PKGPREFIX}-htmlsplit>=1.0.2:../../www/ruby-htmlsplit
+.if ${RUBY_VER} == 16
+DEPENDS+= ${RUBY_PKGPREFIX}-testunit>=0.1:../../devel/ruby-testunit
+DEPENDS+= ${RUBY_PKGPREFIX}-rexml>=2.4.8:../../textproc/ruby-rexml
+.endif
 
-DEPENDS+=	ruby-testunit>=0.1:../../devel/ruby-testunit
-DEPENDS+=	ruby-rexml>=2.4.8:../../textproc/ruby-rexml
+pre-patch:
+	cd ${WRKSRC}/lib; \
+		${RM} formatter.rb html-parser.rb sgml-parser.rb htmlsplit.rb
 
 post-install:
 	${CP} -R ${WRKSRC}/doc ${RUBY_DOCDIR}/webunit
 	${CP} -R ${WRKSRC}/sample ${RUBY_EXAMPLESDIR}/webunit
 
-.include "../../lang/ruby-base/Makefile.common"
+.include "../../lang/ruby/modules.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/ruby-webunit/PLIST b/www/ruby-webunit/PLIST
index 0085e6cbdb6..0d4e01a272b 100644
--- a/www/ruby-webunit/PLIST
+++ b/www/ruby-webunit/PLIST
@@ -1,9 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/12/17 14:37:48 taca Exp $
-${RUBY_SITELIBDIR}/formatter.rb
-${RUBY_SITELIBDIR}/html-parser.rb
+@comment $NetBSD: PLIST,v 1.2 2004/11/28 05:51:59 taca Exp $
 ${RUBY_SITELIBDIR}/htmlrepair.rb
-${RUBY_SITELIBDIR}/htmlsplit.rb
-${RUBY_SITELIBDIR}/sgml-parser.rb
 ${RUBY_SITELIBDIR}/webunit.rb
 ${RUBY_SITELIBDIR}/webunit/assert.rb
 ${RUBY_SITELIBDIR}/webunit/converter.rb
diff --git a/www/ruby-webunit/distinfo b/www/ruby-webunit/distinfo
index 0db753f4049..2f1a87db053 100644
--- a/www/ruby-webunit/distinfo
+++ b/www/ruby-webunit/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1.1.1 2003/12/17 14:37:48 taca Exp $
+$NetBSD: distinfo,v 1.2 2004/11/28 05:51:59 taca Exp $
 
-SHA1 (ruby/webunit-20030121.tar.gz) = 5e128bf0553f17d2966d6c28b8a92b773fedc633
-Size (ruby/webunit-20030121.tar.gz) = 58368 bytes
+SHA1 (ruby/webunit-20040429++.tar.gz) = dfc317b7318731e56dadfe4f7d11acc66f54fa29
+Size (ruby/webunit-20040429++.tar.gz) = 59312 bytes