- Switch to use vendor_dir with Ruby 1.8.7.

Bump PKGREVISION.

2 files changed, 63 insertions, 61 deletions

diff --git a/www/ruby-webunit/Makefile b/www/ruby-webunit/Makefile
index 0ac06acfb00..3ebea130ee6 100644
--- a/www/ruby-webunit/Makefile
+++ b/www/ruby-webunit/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2006/03/04 21:31:03 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2008/06/19 15:05:21 taca Exp $
 
 DISTNAME=	webunit-${VERSION}
 PKGNAME=	${RUBY_PKGPREFIX}-${DISTNAME}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	www textproc ruby
 MASTER_SITES=	http://www.xpenguin.biz/download/webunit/
 
@@ -10,23 +10,25 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.xpenguin.biz/download/webunit/index-en.html
 COMMENT=	HTTP unit testing framework for Ruby
 
+DEPENDS+= ${RUBY_PKGPREFIX}-html-parser>=19990912p1:../../textproc/ruby-html-parser
+DEPENDS+= ${RUBY_PKGPREFIX}-htmlsplit>=1.0.2:../../www/ruby-htmlsplit
+
+USE_TOOLS=	pax
 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
+CONFIGURE_ARGS=	--site-ruby=${PREFIX}/${RUBY_VENDORLIB} \
+		--so-dir=${PREFIX}/${RUBY_VENDORARCHLIB}
 
 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
+	cd ${WRKSRC}/doc; ${PAX} -rw . ${DESTDIR}${PREFIX}/${RUBY_DOC}/webunit
+	cd ${WRKSRC}/sample; ${PAX} -rw . ${DESTDIR}${PREFIX}/${RUBY_EG}/webunit
 
 .include "../../lang/ruby/modules.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/ruby-webunit/PLIST b/www/ruby-webunit/PLIST
index acb0c3bc60a..9e6b50ed4e7 100644
--- a/www/ruby-webunit/PLIST
+++ b/www/ruby-webunit/PLIST
@@ -1,53 +1,53 @@
-@comment $NetBSD: PLIST,v 1.3 2006/09/07 15:56:40 taca Exp $
-${RUBY_SITELIBDIR}/htmlrepair.rb
-${RUBY_SITELIBDIR}/webunit.rb
-${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
-${RUBY_SITELIBDIR}/webunit/form.rb
-${RUBY_SITELIBDIR}/webunit/frame.rb
-${RUBY_SITELIBDIR}/webunit/htmlelem.rb
-${RUBY_SITELIBDIR}/webunit/image.rb
-${RUBY_SITELIBDIR}/webunit/jscript.rb
-${RUBY_SITELIBDIR}/webunit/link.rb
-${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/utils.rb
-${RUBY_SITELIBDIR}/webunit/webunit.rb
-${RUBY_SITELIBDIR}/webunit/ui/cui/testrunner.rb
-${RUBY_DOCDIR}/webunit/index-ja.rd
-${RUBY_DOCDIR}/webunit/COPYING
-${RUBY_DOCDIR}/webunit/TIPS-ja.html
-${RUBY_DOCDIR}/webunit/TIPS-ja.rd
-${RUBY_DOCDIR}/webunit/TODO-ja.html
-${RUBY_DOCDIR}/webunit/TODO-ja.rd
-${RUBY_DOCDIR}/webunit/changes.rd
-${RUBY_DOCDIR}/webunit/example.rd
-${RUBY_DOCDIR}/webunit/index-en.html
-${RUBY_DOCDIR}/webunit/index-en.rd
-${RUBY_DOCDIR}/webunit/index-ja.html
-${RUBY_DOCDIR}/webunit/Makefile
-${RUBY_EXAMPLESDIR}/webunit/conv/test_digit_view.rb
-${RUBY_EXAMPLESDIR}/webunit/conv/digit-0.rb
-${RUBY_EXAMPLESDIR}/webunit/conv/digit-1.cgi
-${RUBY_EXAMPLESDIR}/webunit/conv/digit-1.rb
-${RUBY_EXAMPLESDIR}/webunit/conv/digit.cgi
-${RUBY_EXAMPLESDIR}/webunit/conv/digit.rb
-${RUBY_EXAMPLESDIR}/webunit/conv/test_digit-0.rb
-${RUBY_EXAMPLESDIR}/webunit/conv/test_digit-1.rb
-${RUBY_EXAMPLESDIR}/webunit/conv/test_digit.rb
-${RUBY_EXAMPLESDIR}/webunit/conv/test_digit_view-0.rb
-${RUBY_EXAMPLESDIR}/webunit/conv/test_digit_view-1.rb
-${RUBY_EXAMPLESDIR}/webunit/conv/digit-0.cgi
-@dirrm ${RUBY_SITELIBDIR}/webunit/ui/cui
-@dirrm ${RUBY_SITELIBDIR}/webunit/ui
-@dirrm ${RUBY_SITELIBDIR}/webunit
-@dirrm ${RUBY_DOCDIR}/webunit
-@dirrm ${RUBY_EXAMPLESDIR}/webunit/conv
-@dirrm ${RUBY_EXAMPLESDIR}/webunit
+@comment $NetBSD: PLIST,v 1.4 2008/06/19 15:05:21 taca Exp $
+${RUBY_VENDORLIB}/htmlrepair.rb
+${RUBY_VENDORLIB}/webunit.rb
+${RUBY_VENDORLIB}/webunit/assert.rb
+${RUBY_VENDORLIB}/webunit/converter.rb
+${RUBY_VENDORLIB}/webunit/cookie.rb
+${RUBY_VENDORLIB}/webunit/domwalker.rb
+${RUBY_VENDORLIB}/webunit/exception.rb
+${RUBY_VENDORLIB}/webunit/form.rb
+${RUBY_VENDORLIB}/webunit/frame.rb
+${RUBY_VENDORLIB}/webunit/htmlelem.rb
+${RUBY_VENDORLIB}/webunit/image.rb
+${RUBY_VENDORLIB}/webunit/jscript.rb
+${RUBY_VENDORLIB}/webunit/link.rb
+${RUBY_VENDORLIB}/webunit/params.rb
+${RUBY_VENDORLIB}/webunit/parser.rb
+${RUBY_VENDORLIB}/webunit/response.rb
+${RUBY_VENDORLIB}/webunit/runtest.rb
+${RUBY_VENDORLIB}/webunit/table.rb
+${RUBY_VENDORLIB}/webunit/testcase.rb
+${RUBY_VENDORLIB}/webunit/utils.rb
+${RUBY_VENDORLIB}/webunit/webunit.rb
+${RUBY_VENDORLIB}/webunit/ui/cui/testrunner.rb
+${RUBY_DOC}/webunit/index-ja.rd
+${RUBY_DOC}/webunit/COPYING
+${RUBY_DOC}/webunit/TIPS-ja.html
+${RUBY_DOC}/webunit/TIPS-ja.rd
+${RUBY_DOC}/webunit/TODO-ja.html
+${RUBY_DOC}/webunit/TODO-ja.rd
+${RUBY_DOC}/webunit/changes.rd
+${RUBY_DOC}/webunit/example.rd
+${RUBY_DOC}/webunit/index-en.html
+${RUBY_DOC}/webunit/index-en.rd
+${RUBY_DOC}/webunit/index-ja.html
+${RUBY_DOC}/webunit/Makefile
+${RUBY_EG}/webunit/conv/test_digit_view.rb
+${RUBY_EG}/webunit/conv/digit-0.rb
+${RUBY_EG}/webunit/conv/digit-1.cgi
+${RUBY_EG}/webunit/conv/digit-1.rb
+${RUBY_EG}/webunit/conv/digit.cgi
+${RUBY_EG}/webunit/conv/digit.rb
+${RUBY_EG}/webunit/conv/test_digit-0.rb
+${RUBY_EG}/webunit/conv/test_digit-1.rb
+${RUBY_EG}/webunit/conv/test_digit.rb
+${RUBY_EG}/webunit/conv/test_digit_view-0.rb
+${RUBY_EG}/webunit/conv/test_digit_view-1.rb
+${RUBY_EG}/webunit/conv/digit-0.cgi
+@dirrm ${RUBY_VENDORLIB}/webunit/ui/cui
+@dirrm ${RUBY_VENDORLIB}/webunit/ui
+@dirrm ${RUBY_VENDORLIB}/webunit
+@dirrm ${RUBY_DOC}/webunit
+@dirrm ${RUBY_EG}/webunit/conv
+@dirrm ${RUBY_EG}/webunit