- Switch to use vendor_dir with Ruby 1.8.7.

Bump PKGREVISION.

4 files changed, 23 insertions, 21 deletions

diff --git a/security/ruby-password/Makefile b/security/ruby-password/Makefile
index 73bcf08e72f..305719563ec 100644
--- a/security/ruby-password/Makefile
+++ b/security/ruby-password/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/04/01 21:47:22 minskim Exp $
+# $NetBSD: Makefile,v 1.2 2008/06/19 14:53:26 taca Exp $
 
 DISTNAME=	ruby-password-0.5.3
 PKGNAME=	${DISTNAME:S/ruby/${RUBY_PKGPREFIX}/}
+PKGREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	http://www.caliban.org/files/ruby/
 
diff --git a/security/ruby-password/PLIST b/security/ruby-password/PLIST
index ffa754fa0c9..83dafd77e5c 100644
--- a/security/ruby-password/PLIST
+++ b/security/ruby-password/PLIST
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST,v 1.2 2006/04/05 18:54:26 minskim Exp $
-${RUBY_SITELIBDIR}/password.rb
-${RUBY_SITEARCHLIBDIR}/crack.${RUBY_DLEXT}
+@comment $NetBSD: PLIST,v 1.3 2008/06/19 14:53:26 taca Exp $
+${RUBY_VENDORLIB}/password.rb
+${RUBY_VENDORARCHLIB}/crack.${RUBY_DLEXT}
diff --git a/security/ruby-tcpwrap/Makefile b/security/ruby-tcpwrap/Makefile
index 0c2f2a59f7c..2a8b2a8cc9d 100644
--- a/security/ruby-tcpwrap/Makefile
+++ b/security/ruby-tcpwrap/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2006/01/03 15:07:29 taca Exp $
+# $NetBSD: Makefile,v 1.15 2008/06/19 14:53:34 taca Exp $
 
 DISTNAME=	ruby-tcpwrap-0.6
 PKGNAME=	${RUBY_PKGPREFIX}-tcpwrap-0.6
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	security ruby
 MASTER_SITES=	http://www.shugo.net/archive/ruby-tcpwrap/
 
@@ -17,15 +17,16 @@ INSTALL_TARGET=		site-install
 DOCS_EN=		README.en doc/tcpwrap.html.en
 DOCS_JA=		README.ja doc/tcpwrap.html.ja
 
+INSTALLATION_DIRS=	${RUBY_DOC}/tcpwrap/ja ${RUBY_EG}/tcpwrap
+
 post-install:
-	${INSTALL_DATA_DIR} ${RUBY_EXAMPLESDIR}/tcpwrap
-	${INSTALL_DATA} ${WRKSRC}/sample/echod.rb ${RUBY_EXAMPLESDIR}/tcpwrap
-	${INSTALL_DATA_DIR} ${RUBY_DOCDIR}/tcpwrap/ja
+	${INSTALL_DATA} ${WRKSRC}/sample/echod.rb \
+		${DESTDIR}${PREFIX}/${RUBY_EG}/tcpwrap
 .for f in ${DOCS_EN}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/tcpwrap
+	${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/${RUBY_DOC}/tcpwrap
 .endfor
 .for f in ${DOCS_JA}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/tcpwrap/ja
+	${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/${RUBY_DOC}/tcpwrap/ja
 .endfor
 
 .include "../../lang/ruby/modules.mk"
diff --git a/security/ruby-tcpwrap/PLIST b/security/ruby-tcpwrap/PLIST
index 8f47c8e3c4e..0dfc9224ac6 100644
--- a/security/ruby-tcpwrap/PLIST
+++ b/security/ruby-tcpwrap/PLIST
@@ -1,10 +1,10 @@
-@comment $NetBSD: PLIST,v 1.3 2006/09/07 15:55:09 taca Exp $
-${RUBY_SITEARCHLIBDIR}/tcpwrap.${RUBY_DLEXT}
-${RUBY_EXAMPLESDIR}/tcpwrap/echod.rb
-${RUBY_DOCDIR}/tcpwrap/README.en
-${RUBY_DOCDIR}/tcpwrap/tcpwrap.html.en
-${RUBY_DOCDIR}/tcpwrap/ja/README.ja
-${RUBY_DOCDIR}/tcpwrap/ja/tcpwrap.html.ja
-@dirrm ${RUBY_EXAMPLESDIR}/tcpwrap
-@dirrm ${RUBY_DOCDIR}/tcpwrap/ja
-@dirrm ${RUBY_DOCDIR}/tcpwrap
+@comment $NetBSD: PLIST,v 1.4 2008/06/19 14:53:34 taca Exp $
+${RUBY_VENDORARCHLIB}/tcpwrap.${RUBY_DLEXT}
+${RUBY_EG}/tcpwrap/echod.rb
+${RUBY_DOC}/tcpwrap/README.en
+${RUBY_DOC}/tcpwrap/tcpwrap.html.en
+${RUBY_DOC}/tcpwrap/ja/README.ja
+${RUBY_DOC}/tcpwrap/ja/tcpwrap.html.ja
+@dirrm ${RUBY_EG}/tcpwrap
+@dirrm ${RUBY_DOC}/tcpwrap/ja
+@dirrm ${RUBY_DOC}/tcpwrap