Disable packages used with ruby16-base only or bundled with

ruby18-base packages.

9 files changed, 33 insertions, 33 deletions

diff --git a/converters/Makefile b/converters/Makefile
index b539068d1c9..04f028e0b03 100644
--- a/converters/Makefile
+++ b/converters/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.77 2005/06/26 22:10:04 markd Exp $
+# $NetBSD: Makefile,v 1.78 2005/11/02 09:20:50 taca Exp $
 #
 
 COMMENT=	Document format and character code converters
@@ -54,7 +54,7 @@ SUBDIR+=	ru-d1489
 SUBDIR+=	ruby-iconv
 SUBDIR+=	ruby-romkan
 SUBDIR+=	ruby-uconv
-SUBDIR+=	ruby16-iconv
+#SUBDIR+=	ruby16-iconv
 SUBDIR+=	tex2rtf
 SUBDIR+=	txt2html
 SUBDIR+=	txt2man
diff --git a/devel/Makefile b/devel/Makefile
index 1d6a92941c3..7ff55a4546f 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.686 2005/11/02 09:01:50 taca Exp $
+# $NetBSD: Makefile,v 1.687 2005/11/02 09:20:50 taca Exp $
 #
 
 COMMENT=	Development utilities
@@ -560,18 +560,18 @@ SUBDIR+=	ruby-curses
 SUBDIR+=	ruby-filelock
 SUBDIR+=	ruby-installpkg
 SUBDIR+=	ruby-mode
-SUBDIR+=	ruby-optparse
+#SUBDIR+=	ruby-optparse
 SUBDIR+=	ruby-racc
 SUBDIR+=	ruby-rd-mode
 SUBDIR+=	ruby-readline
-SUBDIR+=	ruby-strscan
+#SUBDIR+=	ruby-strscan
 SUBDIR+=	ruby-subversion
-SUBDIR+=	ruby-testunit
-SUBDIR+=	ruby-textbuf
-SUBDIR+=	ruby-unit
-SUBDIR+=	ruby16-curses
-SUBDIR+=	ruby16-racc
-SUBDIR+=	ruby16-zlib
+#SUBDIR+=	ruby-testunit
+#SUBDIR+=	ruby-textbuf
+#SUBDIR+=	ruby-unit
+#SUBDIR+=	ruby16-curses
+#SUBDIR+=	ruby16-racc
+#SUBDIR+=	ruby16-zlib
 SUBDIR+=	rudiments
 SUBDIR+=	rvm
 SUBDIR+=	rx
diff --git a/lang/Makefile b/lang/Makefile
index d50c4376f56..97ae3bab443 100644
--- a/lang/Makefile
+++ b/lang/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.221 2005/10/20 17:47:11 wiz Exp $
+# $NetBSD: Makefile,v 1.222 2005/11/02 09:20:50 taca Exp $
 #
 
 COMMENT=	Programming languages
@@ -132,8 +132,8 @@ SUBDIR+=	rexx-imc
 SUBDIR+=	rexx-regina
 SUBDIR+=	ruby
 SUBDIR+=	ruby-doc-stdlib
-SUBDIR+=	ruby16
-SUBDIR+=	ruby16-base
+#SUBDIR+=	ruby16
+#SUBDIR+=	ruby16-base
 SUBDIR+=	ruby18
 SUBDIR+=	ruby18-base
 SUBDIR+=	sablevm
diff --git a/math/Makefile b/math/Makefile
index 46e5deccda6..7c505c9f291 100644
--- a/math/Makefile
+++ b/math/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.138 2005/10/13 10:57:04 seb Exp $
+# $NetBSD: Makefile,v 1.139 2005/11/02 09:20:50 taca Exp $
 #
 
 COMMENT=	Mathematics
@@ -100,7 +100,7 @@ SUBDIR+=	qalculate-kde
 SUBDIR+=	qalculate-units
 SUBDIR+=	quadpack
 SUBDIR+=	randlib
-SUBDIR+=	ruby-bigfloat
+#SUBDIR+=	ruby-bigfloat
 SUBDIR+=	ruby-bitvector
 SUBDIR+=	ruby-gsl
 SUBDIR+=	sc
diff --git a/net/Makefile b/net/Makefile
index b25dd0e63c9..bbf687e4e95 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.584 2005/10/29 17:00:52 minskim Exp $
+# $NetBSD: Makefile,v 1.585 2005/11/02 09:20:51 taca Exp $
 #
 
 COMMENT=	Networking tools
@@ -345,9 +345,9 @@ SUBDIR+=	rp-l2tp
 SUBDIR+=	rp-pppoe
 SUBDIR+=	rsync
 SUBDIR+=	rtorrent
-SUBDIR+=	ruby-drb
+#SUBDIR+=	ruby-drb
 SUBDIR+=	ruby-icmp
-SUBDIR+=	ruby-xmlrpc4r
+#SUBDIR+=	ruby-xmlrpc4r
 SUBDIR+=	samba
 SUBDIR+=	scamper
 SUBDIR+=	scapy
diff --git a/security/Makefile b/security/Makefile
index 323328fb824..9395cd4c0d2 100644
--- a/security/Makefile
+++ b/security/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.252 2005/11/02 09:01:50 taca Exp $
+# $NetBSD: Makefile,v 1.253 2005/11/02 09:20:51 taca Exp $
 #
 
 COMMENT=	Security tools
@@ -203,8 +203,8 @@ SUBDIR+=	rc5des
 SUBDIR+=	rid
 SUBDIR+=	rsaref
 SUBDIR+=	ruby-tcpwrap
-SUBDIR+=	ruby16-digest
-SUBDIR+=	ruby16-openssl
+#SUBDIR+=	ruby16-digest
+#SUBDIR+=	ruby16-openssl
 SUBDIR+=	scanssh
 SUBDIR+=	seahorse
 SUBDIR+=	secpanel
diff --git a/textproc/Makefile b/textproc/Makefile
index a5244d52dc2..2256094f5e1 100644
--- a/textproc/Makefile
+++ b/textproc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.299 2005/10/23 19:15:36 minskim Exp $
+# $NetBSD: Makefile,v 1.300 2005/11/02 09:20:51 taca Exp $
 #
 
 COMMENT=	Text processing utilities (does not include desktop publishing)
@@ -251,16 +251,16 @@ SUBDIR+=	rtf-tools
 SUBDIR+=	rtfm
 SUBDIR+=	rubber
 SUBDIR+=	ruby-amrita
-SUBDIR+=	ruby-erb
+#SUBDIR+=	ruby-erb
 SUBDIR+=	ruby-eruby
 SUBDIR+=	ruby-html-parser
 SUBDIR+=	ruby-nqxml
-SUBDIR+=	ruby-rdoc
+#SUBDIR+=	ruby-rdoc
 SUBDIR+=	ruby-rdtool
 SUBDIR+=	ruby-redcloth
-SUBDIR+=	ruby-rexml
+#SUBDIR+=	ruby-rexml
 SUBDIR+=	ruby-rttool
-SUBDIR+=	ruby-syck
+#SUBDIR+=	ruby-syck
 SUBDIR+=	ruby-xmlparser
 SUBDIR+=	ruby-xmlscan
 SUBDIR+=	sablotron
diff --git a/www/Makefile b/www/Makefile
index 77cf7fac79e..cc410ed8730 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.416 2005/10/25 13:34:35 wiz Exp $
+# $NetBSD: Makefile,v 1.417 2005/11/02 09:20:51 taca Exp $
 #
 
 COMMENT=	Packages related to the World Wide Web
@@ -266,9 +266,9 @@ SUBDIR+=	ruby-clearsilver
 SUBDIR+=	ruby-fcgi
 SUBDIR+=	ruby-htmlsplit
 SUBDIR+=	ruby-tag
-SUBDIR+=	ruby-webrick
+#SUBDIR+=	ruby-webrick
 SUBDIR+=	ruby-webunit
-SUBDIR+=	ruby16-borges
+#SUBDIR+=	ruby16-borges
 SUBDIR+=	sarg
 SUBDIR+=	screws
 SUBDIR+=	sitecopy
diff --git a/x11/Makefile b/x11/Makefile
index f4efcfef3d5..ae1156d8987 100644
--- a/x11/Makefile
+++ b/x11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.416 2005/10/28 02:53:46 minskim Exp $
+# $NetBSD: Makefile,v 1.417 2005/11/02 09:20:51 taca Exp $
 #
 
 COMMENT=	Packages to support the X window system
@@ -202,8 +202,8 @@ SUBDIR+=	rep-gtk
 SUBDIR+=	ruby-gtk
 SUBDIR+=	ruby-tcltklib
 SUBDIR+=	ruby-tk
-SUBDIR+=	ruby16-tcltklib
-SUBDIR+=	ruby16-tk
+#SUBDIR+=	ruby16-tcltklib
+#SUBDIR+=	ruby16-tk
 SUBDIR+=	rxvt
 SUBDIR+=	rxvt-unicode
 SUBDIR+=	speyes