Switch to use vendor_dir with Ruby 1.8.7.

Bump PKGREVISION.

4 files changed, 28 insertions, 26 deletions

diff --git a/converters/ruby-romkan/Makefile b/converters/ruby-romkan/Makefile
index 26f5581571e..966f08cfa36 100644
--- a/converters/ruby-romkan/Makefile
+++ b/converters/ruby-romkan/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2008/03/03 05:51:08 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2008/06/19 14:42:24 taca Exp $
 
 DISTNAME=	ruby-romkan-0.4
 PKGNAME=	${RUBY_PKGPREFIX}-romkan-0.4
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	converters japanese ruby
 MASTER_SITES=	http://0xcc.net/ruby-romkan/
 
@@ -13,19 +13,18 @@ COMMENT=	Romaji <-> Kana conversion library for Ruby
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 NO_CONFIGURE=	yes
+DOCS=		romkan.html romkan.html.ja romkan.en.rd romkan.ja.rd
+INSTALLATION_DIRS=	${RUBY_DOC}/romkan
 
 do-build:
 	cd ${WRKSRC}; ${RUBY_RD} romkan.en.rd > romkan.html
 	cd ${WRKSRC}; ${RUBY_RD} romkan.ja.rd > romkan.html.ja
 
 do-install:
-	${INSTALL_DATA_DIR} ${DESTDIR}${RUBY_SITELIBDIR}
-	${INSTALL_DATA} ${WRKSRC}/romkan.rb ${DESTDIR}${RUBY_SITELIBDIR}
-	${INSTALL_DATA_DIR} ${DESTDIR}${RUBY_DOCDIR}/romkan
-	${INSTALL_DATA} ${WRKSRC}/romkan.html ${DESTDIR}${RUBY_DOCDIR}/romkan
-	${INSTALL_DATA} ${WRKSRC}/romkan.html.ja ${DESTDIR}${RUBY_DOCDIR}/romkan
-	${INSTALL_DATA} ${WRKSRC}/romkan.en.rd ${DESTDIR}${RUBY_DOCDIR}/romkan/romkan.rd
-	${INSTALL_DATA} ${WRKSRC}/romkan.ja.rd ${DESTDIR}${RUBY_DOCDIR}/romkan
+	${INSTALL_DATA} ${WRKSRC}/romkan.rb ${DESTDIR}${PREFIX}/${RUBY_VENDORLIB}
+.for f in ${DOCS}
+	cd ${WRKSRC}; ${INSTALL_DATA} ${f} ${DESTDIR}${PREFIX}/${RUBY_DOC}/romkan
+.endfor
 
 .include "../../lang/ruby/modules.mk"
 .include "../../textproc/ruby-rdtool/buildlink3.mk"
diff --git a/converters/ruby-romkan/PLIST b/converters/ruby-romkan/PLIST
index 7534ca7c561..f039f698839 100644
--- a/converters/ruby-romkan/PLIST
+++ b/converters/ruby-romkan/PLIST
@@ -1,7 +1,7 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/05/31 13:00:12 seb Exp $
-${RUBY_SITELIBDIR}/romkan.rb
-${RUBY_DOCDIR}/romkan/romkan.html
-${RUBY_DOCDIR}/romkan/romkan.html.ja
-${RUBY_DOCDIR}/romkan/romkan.ja.rd
-${RUBY_DOCDIR}/romkan/romkan.rd
-@dirrm ${RUBY_DOCDIR}/romkan
+@comment $NetBSD: PLIST,v 1.2 2008/06/19 14:42:24 taca Exp $
+${RUBY_VENDORLIB}/romkan.rb
+${RUBY_DOC}/romkan/romkan.html
+${RUBY_DOC}/romkan/romkan.html.ja
+${RUBY_DOC}/romkan/romkan.ja.rd
+${RUBY_DOC}/romkan/romkan.en.rd
+@dirrm ${RUBY_DOC}/romkan
diff --git a/converters/ruby-uconv/Makefile b/converters/ruby-uconv/Makefile
index 4397cad57f9..ba8ff2c8655 100644
--- a/converters/ruby-uconv/Makefile
+++ b/converters/ruby-uconv/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2006/01/03 15:07:28 taca Exp $
+# $NetBSD: Makefile,v 1.14 2008/06/19 14:42:43 taca Exp $
 
 DISTNAME=	uconv-0.4.12
 PKGNAME=	${RUBY_PKGPREFIX}-${DISTNAME}
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	converters japanese ruby
 MASTER_SITES=	http://www.yoshidam.net/
 
@@ -14,12 +14,15 @@ RUBY_HAS_ARCHLIB=	yes
 USE_RUBY_EXTCONF=	yes
 WRKSRC=			${WRKDIR}/uconv
 
+INSTALLATION_DIRS=	${RUBY_DOC}/uconv
 INSTALL_TARGET=		site-install
 
+DOCS=			README README.ja
+
 post-install:
-	${INSTALL_DATA_DIR} ${RUBY_DOCDIR}/uconv
-	${INSTALL_DATA} ${WRKSRC}/README ${RUBY_DOCDIR}/uconv
-	${INSTALL_DATA} ${WRKSRC}/README.ja ${RUBY_DOCDIR}/uconv
+.for f in ${DOCS}
+	cd ${WRKSRC}; ${INSTALL_DATA} ${f} ${DESTDIR}${PREFIX}/${RUBY_DOC}/uconv
+.endfor
 
 .include "../../lang/ruby/modules.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/converters/ruby-uconv/PLIST b/converters/ruby-uconv/PLIST
index 1c8001171ea..cdf38f18841 100644
--- a/converters/ruby-uconv/PLIST
+++ b/converters/ruby-uconv/PLIST
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.3 2004/12/04 17:20:46 taca Exp $
-${RUBY_SITEARCHLIBDIR}/uconv.${RUBY_DLEXT}
-${RUBY_DOCDIR}/uconv/README
-${RUBY_DOCDIR}/uconv/README.ja
-@dirrm ${RUBY_DOCDIR}/uconv
+@comment $NetBSD: PLIST,v 1.4 2008/06/19 14:42:43 taca Exp $
+${RUBY_VENDORARCHLIB}/uconv.${RUBY_DLEXT}
+${RUBY_DOC}/uconv/README
+${RUBY_DOC}/uconv/README.ja
+@dirrm ${RUBY_DOC}/uconv