* Mark these packages Ruby 1.8.x support only.

* Add some comments and a little clean up.

No functional change.

6 files changed, 25 insertions, 13 deletions

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: