Stop handling DIST_SUBDIR default for Ruby based packages.

Second, update distinfo and/or stop using USE_RUBY_DIST_SUBDIR in Makefiles.

12 files changed, 39 insertions, 44 deletions

diff --git a/textproc/ruby-amrita/Makefile b/textproc/ruby-amrita/Makefile
index 03e6b7d9f66..4a9ca31e114 100644
--- a/textproc/ruby-amrita/Makefile
+++ b/textproc/ruby-amrita/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2006/01/03 07:27:54 taca Exp $
+# $NetBSD: Makefile,v 1.11 2006/01/03 14:25:50 taca Exp $
 
 DISTNAME=	amrita-1.0.2
 PKGNAME=	${RUBY_PKGPREFIX}-${DISTNAME}
@@ -16,7 +16,6 @@ CONFLICTS+=	ruby[1-9][0-9]-amrita-*
 NO_BUILD=	yes
 DOCS=		ChangeLog README README_ja
 REPLACE_RUBY=	bin/ams bin/amshandler bin/amx
-USE_RUBY_DIST_SUBDIR=	yes
 
 INSTALLATION_DIRS=	bin
 
diff --git a/textproc/ruby-amrita/distinfo b/textproc/ruby-amrita/distinfo
index d779c900dc6..4e68d187b93 100644
--- a/textproc/ruby-amrita/distinfo
+++ b/textproc/ruby-amrita/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2005/02/24 14:48:49 agc Exp $
+$NetBSD: distinfo,v 1.4 2006/01/03 14:25:50 taca Exp $
 
-SHA1 (ruby/amrita-1.0.2.tar.gz) = b9d74d73b7668bcbfa60abf8c076bc12f71c6898
-RMD160 (ruby/amrita-1.0.2.tar.gz) = 348a6a52de58fe5a6ae0dc5a082018a6ba5702f6
-Size (ruby/amrita-1.0.2.tar.gz) = 221789 bytes
+SHA1 (amrita-1.0.2.tar.gz) = b9d74d73b7668bcbfa60abf8c076bc12f71c6898
+RMD160 (amrita-1.0.2.tar.gz) = 348a6a52de58fe5a6ae0dc5a082018a6ba5702f6
+Size (amrita-1.0.2.tar.gz) = 221789 bytes
diff --git a/textproc/ruby-eruby/distinfo b/textproc/ruby-eruby/distinfo
index 89763f978c1..e154e7333e9 100644
--- a/textproc/ruby-eruby/distinfo
+++ b/textproc/ruby-eruby/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.9 2005/02/24 14:48:49 agc Exp $
+$NetBSD: distinfo,v 1.10 2006/01/03 14:25:50 taca Exp $
 
-SHA1 (ruby/eruby-1.0.5.tar.gz) = d8900f8a7c30661351d2bf6f53753fa86df24996
-RMD160 (ruby/eruby-1.0.5.tar.gz) = 4fb288dd768f98780dc705574968f090cd82d560
-Size (ruby/eruby-1.0.5.tar.gz) = 61187 bytes
+SHA1 (eruby-1.0.5.tar.gz) = d8900f8a7c30661351d2bf6f53753fa86df24996
+RMD160 (eruby-1.0.5.tar.gz) = 4fb288dd768f98780dc705574968f090cd82d560
+Size (eruby-1.0.5.tar.gz) = 61187 bytes
 SHA1 (patch-aa) = ca7a9d4d9827b18040cbebac54eabe762355b76d
 SHA1 (patch-ab) = bf3bce49348e0e157b67e5e4a26c2e9411248a84
 SHA1 (patch-ac) = 1b035cbaec6c905a01344eb56401f5b0c4fa6ed6
diff --git a/textproc/ruby-html-parser/distinfo b/textproc/ruby-html-parser/distinfo
index cdd077898d3..e515f6f5492 100644
--- a/textproc/ruby-html-parser/distinfo
+++ b/textproc/ruby-html-parser/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2005/11/03 05:16:51 taca Exp $
+$NetBSD: distinfo,v 1.4 2006/01/03 14:25:50 taca Exp $
 
-SHA1 (ruby/html-parser-19990912p2.tar.gz) = 9af1a9c5cd952f5b392ef6cfa13b8778184253e7
-RMD160 (ruby/html-parser-19990912p2.tar.gz) = aad044d8ae91e98f59888dc52e51aee8aa184e57
-Size (ruby/html-parser-19990912p2.tar.gz) = 7216 bytes
+SHA1 (html-parser-19990912p2.tar.gz) = 9af1a9c5cd952f5b392ef6cfa13b8778184253e7
+RMD160 (html-parser-19990912p2.tar.gz) = aad044d8ae91e98f59888dc52e51aee8aa184e57
+Size (html-parser-19990912p2.tar.gz) = 7216 bytes
 SHA1 (patch-aa) = 4a5ca1551f28bf03ba4d77e323da48846273dc7e
diff --git a/textproc/ruby-nqxml/distinfo b/textproc/ruby-nqxml/distinfo
index 1b9c20cfb60..8907d95f382 100644
--- a/textproc/ruby-nqxml/distinfo
+++ b/textproc/ruby-nqxml/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2005/02/24 14:48:49 agc Exp $
+$NetBSD: distinfo,v 1.3 2006/01/03 14:25:51 taca Exp $
 
-SHA1 (ruby/nqxml-1.1.3p1.tar.gz) = abac255fdfd09dfc269bf7488029b41081cff44e
-RMD160 (ruby/nqxml-1.1.3p1.tar.gz) = 62d48b8f35062de3816dd6177c9739a5d2ebb33a
-Size (ruby/nqxml-1.1.3p1.tar.gz) = 63165 bytes
+SHA1 (nqxml-1.1.3p1.tar.gz) = abac255fdfd09dfc269bf7488029b41081cff44e
+RMD160 (nqxml-1.1.3p1.tar.gz) = 62d48b8f35062de3816dd6177c9739a5d2ebb33a
+Size (nqxml-1.1.3p1.tar.gz) = 63165 bytes
diff --git a/textproc/ruby-rdtool/Makefile b/textproc/ruby-rdtool/Makefile
index 091e5426ef6..7380fd47c7b 100644
--- a/textproc/ruby-rdtool/Makefile
+++ b/textproc/ruby-rdtool/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/12/29 06:22:19 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2006/01/03 14:25:51 taca Exp $
 
 DISTNAME=	rdtool-0.6.18
 PKGNAME=	${RUBY_PKGPREFIX}-${DISTNAME}
@@ -13,8 +13,6 @@ COMMENT=	RD (Ruby Document) converter to HTML/man/etc
 # install multiple ruby??-rd2 package (unless supported by pkgview.
 CONFLICTS+=	ruby[1-9][0-9]-rdtool-*
 
-USE_RUBY_DIST_SUBDIR=	yes
-
 USE_RUBY_SETUP=	yes
 REPLACE_RUBY=	bin/rd2 bin/rdswap.rb
 
diff --git a/textproc/ruby-rdtool/distinfo b/textproc/ruby-rdtool/distinfo
index c0f8f9ed799..482850a774e 100644
--- a/textproc/ruby-rdtool/distinfo
+++ b/textproc/ruby-rdtool/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.12 2005/11/03 05:21:18 taca Exp $
+$NetBSD: distinfo,v 1.13 2006/01/03 14:25:51 taca Exp $
 
-SHA1 (ruby/rdtool-0.6.18.tar.gz) = 4c0ae3f25a5bca11b5a4b8d9a01f4683b958d9e0
-RMD160 (ruby/rdtool-0.6.18.tar.gz) = 10bd30d26d8264f86b6493a0430d1d1b9e807a9f
-Size (ruby/rdtool-0.6.18.tar.gz) = 80445 bytes
+SHA1 (rdtool-0.6.18.tar.gz) = 4c0ae3f25a5bca11b5a4b8d9a01f4683b958d9e0
+RMD160 (rdtool-0.6.18.tar.gz) = 10bd30d26d8264f86b6493a0430d1d1b9e807a9f
+Size (rdtool-0.6.18.tar.gz) = 80445 bytes
 SHA1 (patch-ae) = 13e2a54d6abec57d20f4d0e9a6d440e40f352787
diff --git a/textproc/ruby-redcloth/distinfo b/textproc/ruby-redcloth/distinfo
index 7958705b964..b4a2c8f6d70 100644
--- a/textproc/ruby-redcloth/distinfo
+++ b/textproc/ruby-redcloth/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.4 2005/11/03 05:59:14 taca Exp $
+$NetBSD: distinfo,v 1.5 2006/01/03 14:25:51 taca Exp $
 
-SHA1 (ruby/RedCloth-3.0.4.tar.gz) = 44b320f34512a747ac60fe9d80a8e325ac1270e8
-RMD160 (ruby/RedCloth-3.0.4.tar.gz) = 1bbb5039940a861818eab685aa1be63b357f6a5e
-Size (ruby/RedCloth-3.0.4.tar.gz) = 38666 bytes
+SHA1 (RedCloth-3.0.4.tar.gz) = 44b320f34512a747ac60fe9d80a8e325ac1270e8
+RMD160 (RedCloth-3.0.4.tar.gz) = 1bbb5039940a861818eab685aa1be63b357f6a5e
+Size (RedCloth-3.0.4.tar.gz) = 38666 bytes
diff --git a/textproc/ruby-rttool/Makefile b/textproc/ruby-rttool/Makefile
index 438e799077e..09cc7baffef 100644
--- a/textproc/ruby-rttool/Makefile
+++ b/textproc/ruby-rttool/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/11/09 04:26:07 taca Exp $
+# $NetBSD: Makefile,v 1.15 2006/01/03 14:25:51 taca Exp $
 
 DISTNAME=	rttool-${VERSION}
 PKGNAME=	${RUBY_PKGPREFIX}-${DISTNAME}
@@ -12,13 +12,11 @@ COMMENT=	RT to HTML (and hopefully LaTeX in future) table converter
 
 CONFLICTS+=	ruby[1-9][0-9]-rttool-*
 
-USE_RUBY_DIST_SUBDIR=	yes
 .include "../../lang/ruby/rubyversion.mk"
 # install a library file to rdtool's directory, too
 BUILDLINK_DEPMETHOD.${RUBY_PKGPREFIX}-rdtool= full
 
 VERSION=		1.0.1
-USE_RUBY_DIST_SUBDIR=	yes
 USE_RUBY_SETUP=		yes
 REPLACE_RUBY_DIRS=	${WRKSRC}/bin/rt ${WRKSRC}/lib/rt
 HTMLDOCS=		rttool.en.html rttool.ja.html
diff --git a/textproc/ruby-rttool/distinfo b/textproc/ruby-rttool/distinfo
index 1e43681b9b4..bc4bb7c409b 100644
--- a/textproc/ruby-rttool/distinfo
+++ b/textproc/ruby-rttool/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.7 2005/11/03 05:26:10 taca Exp $
+$NetBSD: distinfo,v 1.8 2006/01/03 14:25:51 taca Exp $
 
-SHA1 (ruby/rttool-1.0.1.tar.gz) = c71dea6ec5e27fc1aa3b8d32e6aaedaa69b8fc7a
-RMD160 (ruby/rttool-1.0.1.tar.gz) = f9b5b65b84ed7543d9ffd6c896d7e4e72a81fb99
-Size (ruby/rttool-1.0.1.tar.gz) = 35153 bytes
+SHA1 (rttool-1.0.1.tar.gz) = c71dea6ec5e27fc1aa3b8d32e6aaedaa69b8fc7a
+RMD160 (rttool-1.0.1.tar.gz) = f9b5b65b84ed7543d9ffd6c896d7e4e72a81fb99
+Size (rttool-1.0.1.tar.gz) = 35153 bytes
diff --git a/textproc/ruby-xmlparser/distinfo b/textproc/ruby-xmlparser/distinfo
index 00ad35d63f5..a3845065c09 100644
--- a/textproc/ruby-xmlparser/distinfo
+++ b/textproc/ruby-xmlparser/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2005/06/25 02:34:27 taca Exp $
+$NetBSD: distinfo,v 1.4 2006/01/03 14:25:51 taca Exp $
 
-SHA1 (ruby/xmlparser-0.6.8.1.tar.gz) = a392d1a65b9ddf1499fb55778595e14ee686ff80
-RMD160 (ruby/xmlparser-0.6.8.1.tar.gz) = 63841ebf9f259c683eab2ed03c17b2e479c73607
-Size (ruby/xmlparser-0.6.8.1.tar.gz) = 140667 bytes
+SHA1 (xmlparser-0.6.8.1.tar.gz) = a392d1a65b9ddf1499fb55778595e14ee686ff80
+RMD160 (xmlparser-0.6.8.1.tar.gz) = 63841ebf9f259c683eab2ed03c17b2e479c73607
+Size (xmlparser-0.6.8.1.tar.gz) = 140667 bytes
 SHA1 (patch-aa) = caf2667257f38503b6ac5094b570d19f0d16eb69
diff --git a/textproc/ruby-xmlscan/distinfo b/textproc/ruby-xmlscan/distinfo
index 1f235c55e9e..afe8df8abdf 100644
--- a/textproc/ruby-xmlscan/distinfo
+++ b/textproc/ruby-xmlscan/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2005/04/06 14:40:41 minskim Exp $
+$NetBSD: distinfo,v 1.3 2006/01/03 14:25:51 taca Exp $
 
-SHA1 (ruby/xmlscan-0.2.3.tar.gz) = 70c989d3782c916179170238a40b1d7defa9dc47
-RMD160 (ruby/xmlscan-0.2.3.tar.gz) = d83fb70ed24764e1a036f7af79c2b1f3f4e4fa18
-Size (ruby/xmlscan-0.2.3.tar.gz) = 88414 bytes
+SHA1 (xmlscan-0.2.3.tar.gz) = 70c989d3782c916179170238a40b1d7defa9dc47
+RMD160 (xmlscan-0.2.3.tar.gz) = d83fb70ed24764e1a036f7af79c2b1f3f4e4fa18
+Size (xmlscan-0.2.3.tar.gz) = 88414 bytes