- Switch to use vendor_dir with Ruby 1.8.7.

- And make it build with Ruby 1.8.7, too.

Bump PKGREVISION.

4 files changed, 14 insertions, 11 deletions

diff --git a/textproc/ruby-itex2MML/Makefile b/textproc/ruby-itex2MML/Makefile
index 240738c22f5..26c7039e48a 100644
--- a/textproc/ruby-itex2MML/Makefile
+++ b/textproc/ruby-itex2MML/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2007/06/17 17:32:27 minskim Exp $
+# $NetBSD: Makefile,v 1.4 2008/06/19 14:56:14 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/
 
diff --git a/textproc/ruby-itex2MML/PLIST b/textproc/ruby-itex2MML/PLIST
index 2f1cb8e2e84..1648c3d3f8d 100644
--- a/textproc/ruby-itex2MML/PLIST
+++ b/textproc/ruby-itex2MML/PLIST
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2007/06/14 18:56:59 minskim Exp $
-${RUBY_SITEARCHLIBDIR}/itex2MML.${RUBY_DLEXT}
-${RUBY_SITELIBDIR}/itextomml.rb
+@comment $NetBSD: PLIST,v 1.2 2008/06/19 14:56:14 taca Exp $
+${RUBY_VENDORARCHLIB}/itex2MML.${RUBY_DLEXT}
+${RUBY_VENDORLIB}/itextomml.rb
diff --git a/textproc/ruby-itex2MML/distinfo b/textproc/ruby-itex2MML/distinfo
index 72745674681..b03c50fe0c0 100644
--- a/textproc/ruby-itex2MML/distinfo
+++ b/textproc/ruby-itex2MML/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2007/06/17 17:32:27 minskim Exp $
+$NetBSD: distinfo,v 1.3 2008/06/19 14:56:14 taca Exp $
 
 SHA1 (itex2MML-1.2.3/itexToMML.tar.gz) = cd2dc6e23e2d3dce13b5eaac29e0869a4d35be9d
 RMD160 (itex2MML-1.2.3/itexToMML.tar.gz) = 6e49bed01c3522a36bfc677fdc76015163d6e55a
 Size (itex2MML-1.2.3/itexToMML.tar.gz) = 127327 bytes
-SHA1 (patch-aa) = 68660134b805d81d86c6ac7c8a3e591d5705f6be
+SHA1 (patch-aa) = abdc4f3d80878bf69cead0dea8950360495b0040
diff --git a/textproc/ruby-itex2MML/patches/patch-aa b/textproc/ruby-itex2MML/patches/patch-aa
index 2dfab0163af..a4b0db965e9 100644
--- a/textproc/ruby-itex2MML/patches/patch-aa
+++ b/textproc/ruby-itex2MML/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.1.1.1 2007/06/14 18:56:59 minskim Exp $
+$NetBSD: patch-aa,v 1.2 2008/06/19 14:56:14 taca Exp $
 
---- Makefile.orig	2007-02-22 09:51:13.000000000 -0800
+--- Makefile.orig	2007-02-22 17:51:13.000000000 +0000
 +++ Makefile
 @@ -1,6 +1,8 @@
  #YACC=yacc
@@ -30,8 +30,8 @@ $NetBSD: patch-aa,v 1.1.1.1 2007/06/14 18:56:59 minskim Exp $
 -DYLIB_EXT = $(shell ruby -e 'require "rbconfig"; print Config::CONFIG["DLEXT"]')
 +RUBY_ARCH = $(shell ${RUBY} -e 'require "rbconfig"; print Config::CONFIG["arch"]')
 +RUBYDIR = $(shell ${RUBY} -e 'require "rbconfig"; print Config::CONFIG["archdir"]')
-+RUBY_SITEDIR = $(shell ${RUBY} -e 'require "rbconfig"; print Config::CONFIG["sitelibdir"]')
-+RUBY_SITEARCHDIR = $(shell ${RUBY} -e 'require "rbconfig"; print Config::CONFIG["sitearchdir"]')
++RUBY_SITEDIR = $(shell ${RUBY} -e 'require "rbconfig"; print Config::CONFIG["vendorlibdir"]')
++RUBY_SITEARCHDIR = $(shell ${RUBY} -e 'require "rbconfig"; print Config::CONFIG["vendorarchdir"]')
 +LIBRUBYARG = $(shell ${RUBY} -e 'require "rbconfig"; print Config::CONFIG["LIBRUBYARG"]')
 +DYLIB_EXT = $(shell ${RUBY} -e 'require "rbconfig"; print Config::CONFIG["DLEXT"]')
  
@@ -41,7 +41,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2007/06/14 18:56:59 minskim Exp $
  
  itex2MML_ruby.o:	itex2MML_ruby.c
  			$(CC) $(RUBY_CFLAGS) -c itex2MML_ruby.c -I$(RUBYDIR) -o itex2MML_ruby.o
-@@ -61,7 +63,7 @@ ruby:	itex2MML_ruby.o y.tab_ruby.o lex.y
+@@ -61,8 +63,8 @@ ruby:	itex2MML_ruby.o y.tab_ruby.o lex.y
  	$(RUBY_LD) itex2MML_ruby.o y.tab_ruby.o lex.yy_ruby.o -L$(RUBYLIBDIR) $(LIBRUBYARG) -o itex2MML.$(DYLIB_EXT)
  
  test_ruby:
@@ -50,3 +50,5 @@ $NetBSD: patch-aa,v 1.1.1.1 2007/06/14 18:56:59 minskim Exp $
  
  install_ruby:	itex2MML.$(DYLIB_EXT)
  	$(INSTALL) itex2MML.$(DYLIB_EXT) $(RUBY_SITEARCHDIR)
+-	$(INSTALL) itextomml.rb $(RUBY_SITEDIR)
++	$(INSTALL) -m 0644 itextomml.rb $(RUBY_SITEDIR)