* Mark these packages Ruby 1.8.x support only.

* Add some comments and a little clean up.

No functional change.

19 files changed, 67 insertions, 26 deletions

diff --git a/converters/ruby-uconv/Makefile b/converters/ruby-uconv/Makefile
index 6d57b9143bf..cb9cac28480 100644
--- a/converters/ruby-uconv/Makefile
+++ b/converters/ruby-uconv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2009/10/17 13:08:20 taca Exp $
+# $NetBSD: Makefile,v 1.17 2010/09/07 17:20:24 taca Exp $
 
 DISTNAME=	uconv-0.4.12
 PKGNAME=	${RUBY_PKGPREFIX}-${DISTNAME}
@@ -12,6 +12,7 @@ COMMENT=	Unicode conversion library with Japanese codesets support
 
 PKG_DESTDIR_SUPPORT=	destdir
 
+# Depends on Ruby's internal and use 1.9's encoding support.
 RUBY_VERSION_SUPPORTED= 18
 RUBY_HAS_ARCHLIB=	yes
 USE_RUBY_EXTCONF=	yes
diff --git a/devel/rake/Makefile b/devel/rake/Makefile
index 3fb92a9e4da..8106db37c30 100644
--- a/devel/rake/Makefile
+++ b/devel/rake/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2009/06/10 21:51:17 minskim Exp $
+# $NetBSD: Makefile,v 1.14 2010/09/07 17:20:24 taca Exp $
 
 DISTNAME=	rake-0.8.7
 CATEGORIES=	devel
@@ -10,6 +10,8 @@ COMMENT=	Ruby Make
 USE_TOOLS+=	gzip
 GEM_BUILD=	gemspec
 
+# rake is bundled Ruby 1.9
+RUBY_VERSION_SUPPORTED= 18
 INSTALLATION_DIRS=	${PKGMANDIR}/man1
 
 post-extract:
diff --git a/devel/ruby-debug-base/Makefile b/devel/ruby-debug-base/Makefile
index c8b3a186ab9..4c153b3d8d8 100644
--- a/devel/ruby-debug-base/Makefile
+++ b/devel/ruby-debug-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2008/09/15 09:03:58 taca Exp $
+# $NetBSD: Makefile,v 1.4 2010/09/07 17:20:25 taca Exp $
 
 DISTNAME=	ruby-debug-base-0.10.2
 PKGNAME=	${RUBY_PKGPREFIX}-${DISTNAME}
@@ -10,5 +10,7 @@ COMMENT=	Fast implementation of the standard Ruby debugger
 
 DEPENDS+=	${RUBY_PKGPREFIX}-linecache>=0.3:../../devel/ruby-linecache
 
+RUBY_VERSION_SUPPORTED= 18
+
 .include "../../misc/rubygems/rubygem.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/ruby-debug-ide/Makefile b/devel/ruby-debug-ide/Makefile
index 3a15c575ab4..5b088d35c92 100644
--- a/devel/ruby-debug-ide/Makefile
+++ b/devel/ruby-debug-ide/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2008/09/15 09:05:24 taca Exp $
+# $NetBSD: Makefile,v 1.5 2010/09/07 17:20:25 taca Exp $
 
 DISTNAME=	ruby-debug-ide-0.3.0
 PKGNAME=	${RUBYGEM_PKGPREFIX}-${DISTNAME}
@@ -10,6 +10,8 @@ COMMENT=	IDEs interface to ruby-debug
 
 DEPENDS+=	${RUBYGEM_PKGPREFIX}-ruby-debug-base-[0-9]*:../../devel/ruby-debug-base
 
+RUBY_VERSION_SUPPORTED= 18
+
 GEM_BUILD=	gemspec
 
 .include "../../misc/rubygems/rubygem.mk"
diff --git a/devel/ruby-debug/Makefile b/devel/ruby-debug/Makefile
index 24fef4c386f..3d1b3c672a0 100644
--- a/devel/ruby-debug/Makefile
+++ b/devel/ruby-debug/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2008/09/15 09:02:55 taca Exp $
+# $NetBSD: Makefile,v 1.4 2010/09/07 17:20:25 taca Exp $
 
 DISTNAME=	ruby-debug-0.10.2
 PKGNAME=	${RUBYGEM_PKGPREFIX}-${DISTNAME}
@@ -11,6 +11,8 @@ COMMENT=	Command line interface for ruby-debug
 DEPENDS+=	${RUBY_PKGPREFIX}-columnize>=0.1:../../misc/ruby-columnize
 DEPENDS+=	${RUBY_PKGPREFIX}-ruby-debug-base>=0.10.2{,nb[0-9]*}:../../devel/ruby-debug-base
 
+RUBY_VERSION_SUPPORTED= 18
+
 post-extract:
 	cd ${WRKSRC} && echo ${PKGVERSION_NOREV} > VERSION
 
diff --git a/devel/ruby-eet/Makefile b/devel/ruby-eet/Makefile
index e8a3d3b5df3..e07218f45e1 100644
--- a/devel/ruby-eet/Makefile
+++ b/devel/ruby-eet/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2010/01/18 09:58:47 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2010/09/07 17:20:25 taca Exp $
 
 DISTNAME=	ruby-eet-0.1.4
 PKGNAME=	${RUBY_PKGPREFIX}-${DISTNAME:S/ruby-//}
@@ -12,6 +12,8 @@ COMMENT=	Ruby module to read and write EET files
 
 BUILD_DEPENDS+=	rake-[0-9]*:../../devel/rake
 
+RUBY_VERSION_SUPPORTED= 18
+
 USE_TOOLS+=	pkg-config
 
 .include "../../devel/eet/buildlink3.mk"
diff --git a/devel/ruby-linecache/Makefile b/devel/ruby-linecache/Makefile
index addd379f497..548b0edcb8c 100644
--- a/devel/ruby-linecache/Makefile
+++ b/devel/ruby-linecache/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2008/06/22 16:04:34 taca Exp $
+# $NetBSD: Makefile,v 1.3 2010/09/07 17:20:25 taca Exp $
 
 DISTNAME=	linecache-0.43
 PKGNAME=	${RUBY_PKGPREFIX}-linecache-0.4.3
@@ -10,6 +10,8 @@ COMMENT=	Ruby module to read and cache lines of a file
 
 GEM_NAME=	linecache-${PKGVERSION_NOREV}
 
+RUBY_VERSION_SUPPORTED= 18
+
 post-extract:
 	cd ${WRKSRC} && echo ${PKGVERSION_NOREV} > VERSION
 
diff --git a/devel/ruby-rcov/Makefile b/devel/ruby-rcov/Makefile
index f4a920e5534..d684e146fd8 100644
--- a/devel/ruby-rcov/Makefile
+++ b/devel/ruby-rcov/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/04/04 15:18:21 jlam Exp $
+# $NetBSD: Makefile,v 1.2 2010/09/07 17:20:25 taca Exp $
 
 DISTNAME=	rcov-0.8.1.2.0
 PKGNAME=	${RUBY_PKGPREFIX}-${DISTNAME}
@@ -8,5 +8,7 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://eigenclass.org/hiki.rb?rcov
 COMMENT=	code coverage analysis for Ruby
 
+RUBY_VERSION_SUPPORTED= 18
+
 .include "../../misc/rubygems/rubygem.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/ruby-clutter-core/Makefile b/graphics/ruby-clutter-core/Makefile
index 719e52de391..3faa8c77c9b 100644
--- a/graphics/ruby-clutter-core/Makefile
+++ b/graphics/ruby-clutter-core/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2010/06/13 22:44:43 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2010/09/07 17:20:26 taca Exp $
 #
 
 PKGNAME=		${RUBY_PKGPREFIX}-clutter-core-${VERSION}
@@ -12,6 +12,8 @@ RUBY_EXTCONF_SUBDIRS=	clutter
 
 USE_TOOLS+=		pkg-config
 
+RUBY_VERSION_SUPPORTED= 18
+
 .include "../../devel/ruby-gnome2-glib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../graphics/clutter08/buildlink3.mk"
diff --git a/inputmethod/prime/Makefile b/inputmethod/prime/Makefile
index 4352a34d388..6208007fc1e 100644
--- a/inputmethod/prime/Makefile
+++ b/inputmethod/prime/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2010/05/16 00:26:49 obache Exp $
+# $NetBSD: Makefile,v 1.6 2010/09/07 17:20:26 taca Exp $
 #
 
 DISTNAME=	prime-1.0.0.1
@@ -18,6 +18,15 @@ DEPENDS+=	${RUBY_PKGPREFIX}-suikyo>=2.0:../../textproc/ruby-suikyo
 DEPENDS+=	${RUBY_PKGPREFIX}-progressbar-[0-9]*:../../misc/ruby-progressbar
 DEPENDS+=	${RUBY_PKGPREFIX}-sary-[0-9]*:../../textproc/ruby-sary
 
+#
+# The same dictonary directory now.
+#
+#CONFLICTS+=	ruby[1-9][0-9]-prime-[1-9]*
+#
+# Currently, it seems some encoding problem. 
+#
+RUBY_VERSION_SUPPORTED= 18
+
 GNU_CONFIGURE=	yes
 USE_TOOLS+=	pkg-config
 USE_LANGUAGES=	# none
diff --git a/misc/rubygems/Makefile b/misc/rubygems/Makefile
index 4e5b254e7db..39c5e6ea64b 100644
--- a/misc/rubygems/Makefile
+++ b/misc/rubygems/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2010/01/27 13:21:58 fhajny Exp $
+# $NetBSD: Makefile,v 1.31 2010/09/07 17:20:26 taca Exp $
 
 DISTNAME=	rubygems-1.3.5
 PKGREVISION=	2
@@ -18,6 +18,7 @@ NO_CONFIGURE=	yes
 NO_BUILD=	yes
 RUBY_REQD=	1.8.7
 
+RUBY_VERSION_SUPPORTED= 18
 REPLACE_RUBY_DIRS=	bin
 REPLACE_RUBY_PAT=	[a-z]*
 
diff --git a/net/dnsdoctor/Makefile b/net/dnsdoctor/Makefile
index 6a3ac8a4d76..9601cae02a1 100644
--- a/net/dnsdoctor/Makefile
+++ b/net/dnsdoctor/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2007/01/28 15:22:54 taca Exp $
+# $NetBSD: Makefile,v 1.4 2010/09/07 17:20:26 taca Exp $
 #
 
 DISTNAME=		dnsdoctor-1.0.1
@@ -14,6 +14,7 @@ DEPENDS+=		ruby${RUBY_VER}-base>=${RUBY_REQD}:../../lang/ruby${RUBY_VER}-base
 
 WRKSRC=		${WRKDIR}/dnsdoctor
 
+# Config name conflict, need many changes.
 RUBY_VERSION_SUPPORTED=	18
 NO_BUILD=	yes
 
diff --git a/textproc/migemo/Makefile b/textproc/migemo/Makefile
index 29be3530a00..f125e2aa65a 100644
--- a/textproc/migemo/Makefile
+++ b/textproc/migemo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2009/06/14 09:52:51 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2010/09/07 17:20:26 taca Exp $
 
 .include "../../textproc/migemo/Makefile.common"
 
@@ -12,6 +12,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 DEPENDS+=		${RUBY_PKGPREFIX}-bsearch-*:../../devel/ruby-bsearch
 DEPENDS+=		${RUBY_PKGPREFIX}-romkan-*:../../converters/ruby-romkan
 
+RUBY_VERSION_SUPPORTED= 18
 USE_TOOLS+=		autoconf automake aclocal
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-rubydir=${PREFIX}/${RUBY_VENDORLIB}
diff --git a/textproc/ruby-eruby/Makefile b/textproc/ruby-eruby/Makefile
index 754f9558fef..41f535125d2 100644
--- a/textproc/ruby-eruby/Makefile
+++ b/textproc/ruby-eruby/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2008/07/14 12:56:13 joerg Exp $
+# $NetBSD: Makefile,v 1.24 2010/09/07 17:20:26 taca Exp $
 
 DISTNAME=	eruby-${ERUBY_VERSION}
 PKGNAME=	${RUBY_PKGPREFIX}-${DISTNAME}
@@ -12,6 +12,9 @@ COMMENT=	Interprets Ruby code embedded in a text file
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
+# Need to update encoding processing.
+RUBY_VERSION_SUPPORTED= 18
+
 # manual page conflicts.
 CONFLICTS+=	ruby[1-9][0-9]-eruby-*
 
diff --git a/textproc/ruby-fastercsv/Makefile b/textproc/ruby-fastercsv/Makefile
index 5f6dbd0f8b2..1345bfa8ac3 100644
--- a/textproc/ruby-fastercsv/Makefile
+++ b/textproc/ruby-fastercsv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/04/07 18:03:35 seb Exp $
+# $NetBSD: Makefile,v 1.2 2010/09/07 17:20:27 taca Exp $
 
 DISTNAME=	fastercsv-1.2.3
 PKGNAME=	${RUBYGEM_PKGPREFIX}-${DISTNAME}
@@ -9,5 +9,7 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://fastercsv.rubyforge.org/
 COMMENT=	Replacement to Ruby standard CSV library
 
+RUBY_VERSION_SUPPORTED= 18
+
 .include "../../misc/rubygems/rubygem.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/ruby-ferret/Makefile b/textproc/ruby-ferret/Makefile
index a8c3509686f..f2c555e6f33 100644
--- a/textproc/ruby-ferret/Makefile
+++ b/textproc/ruby-ferret/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2008/06/19 15:21:35 taca Exp $
+# $NetBSD: Makefile,v 1.4 2010/09/07 17:20:27 taca Exp $
 
 DISTNAME=	ferret-0.11.6
 PKGNAME=	${RUBY_PKGPREFIX}-${DISTNAME}
@@ -9,5 +9,7 @@ MAINTAINER=	minskim@NetBSD.org
 HOMEPAGE=	http://ferret.davebalmain.com/
 COMMENT=	Text search engine library written for Ruby
 
+RUBY_VERSION_SUPPORTED= 18
+
 .include "../../misc/rubygems/rubygem.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/ruby-itex2MML/Makefile b/textproc/ruby-itex2MML/Makefile
index 26c7039e48a..a1a04c60843 100644
--- a/textproc/ruby-itex2MML/Makefile
+++ b/textproc/ruby-itex2MML/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.4 2008/06/19 14:56:14 taca Exp $
+# $NetBSD: Makefile,v 1.5 2010/09/07 17:20:27 taca Exp $
 
 DISTNAME=	itexToMML
 PKGNAME=	${RUBY_PKGPREFIX}-itex2MML-${ITEX2MML_VERSION}
 PKGREVISION=	1
 CATEGORIES=	textproc ruby
 MASTER_SITES=	http://golem.ph.utexas.edu/~distler/blog/files/
+DIST_SUBDIR=	itex2MML-${ITEX2MML_VERSION}
 
 MAINTAINER=	minskim@NetBSD.org
 HOMEPAGE=	http://golem.ph.utexas.edu/~distler/blog/itex2MML.html
@@ -12,16 +13,17 @@ COMMENT=	Ruby binding for itex2MML
 
 BUILD_DEPENDS+=	swig>=1.3:../../devel/swig
 
-DIST_SUBDIR=	itex2MML-${ITEX2MML_VERSION}
-USE_TOOLS+=	bison flex gmake
-WRKSRC=		${WRKDIR}/${DISTNAME}/itex-src
-
 ITEX2MML_VERSION=	1.2.3
-MAKE_ENV+=		RUBY=${RUBY:Q}
+RUBY_VERSION_SUPPORTED= 18
 RUBY_HAS_ARCHLIB=	yes
 
-BUILD_TARGET=	ruby
-INSTALL_TARGET=	install_ruby
+USE_TOOLS+=		bison flex gmake
+WRKSRC=			${WRKDIR}/${DISTNAME}/itex-src
+BUILD_TARGET=		ruby
+INSTALL_TARGET=		install_ruby
+
+INSTALLATION_DIRS+=	${RUBY_VENDORARCHLIB}
+MAKE_ENV+=		RUBY=${RUBY:Q}
 
 .include "../../lang/ruby/modules.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/xhtmldiff/Makefile b/textproc/xhtmldiff/Makefile
index 98675f1f40d..8ca679b1f3d 100644
--- a/textproc/xhtmldiff/Makefile
+++ b/textproc/xhtmldiff/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2008/04/04 15:30:01 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2010/09/07 17:20:27 taca Exp $
 
 DISTNAME=	xhtmldiff-1.2.2
 PKGREVISION=	1
@@ -12,6 +12,8 @@ COMMENT=	Tool for generating valid XHTML redline documents
 
 DEPENDS+=	${RUBY_PKGPREFIX}-diff-lcs>=1.1.1:../../textproc/ruby-diff-lcs
 
+RUBY_VERSION_SUPPORTED= 18
+
 GEM_BUILD=	gemspec
 
 post-extract:
diff --git a/x11/ruby-gtk/Makefile b/x11/ruby-gtk/Makefile
index 47801d28319..ecfb8a55a24 100644
--- a/x11/ruby-gtk/Makefile
+++ b/x11/ruby-gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2010/06/13 22:45:53 wiz Exp $
+# $NetBSD: Makefile,v 1.45 2010/09/07 17:20:27 taca Exp $
 
 DISTNAME=	ruby-gtk-${VERSION}
 PKGNAME=	${RUBY_PKGPREFIX}-gtk-${VERSION}
@@ -10,6 +10,7 @@ MAINTAINER=	taca@NetBSD.org
 HOMEPAGE=	http://ruby-gnome.sourceforge.net/
 COMMENT=	Ruby interface to Gtk+ toolkits
 
+RUBY_VERSION_SUPPORTED= 18
 VERSION=		0.34
 RUBY_HAS_ARCHLIB=	yes
 USE_RUBY_EXTCONF=	yes