Update textproc/ruby-itex2MML to 1.3.25.

* Add LICENSE.
* Remove RUBY_HAS_ARCHLIB.
* Add PKG_DESTDIR_SUPPORT.

No exact changes are available.

4 files changed, 41 insertions, 55 deletions

diff --git a/textproc/ruby-itex2MML/Makefile b/textproc/ruby-itex2MML/Makefile
index a1a04c60843..0645309526e 100644
--- a/textproc/ruby-itex2MML/Makefile
+++ b/textproc/ruby-itex2MML/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2010/09/07 17:20:27 taca Exp $
+# $NetBSD: Makefile,v 1.6 2010/09/10 08:15:55 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}
@@ -10,12 +9,14 @@ DIST_SUBDIR=	itex2MML-${ITEX2MML_VERSION}
 MAINTAINER=	minskim@NetBSD.org
 HOMEPAGE=	http://golem.ph.utexas.edu/~distler/blog/itex2MML.html
 COMMENT=	Ruby binding for itex2MML
+LICENSE=	gnu-gpl-v2 OR gnu-lgpl-v2 OR mpl-1.0
 
 BUILD_DEPENDS+=	swig>=1.3:../../devel/swig
 
-ITEX2MML_VERSION=	1.2.3
+PKG_DESTDIR_SUPPORT=	user-destdir
+
+ITEX2MML_VERSION=	1.3.25
 RUBY_VERSION_SUPPORTED= 18
-RUBY_HAS_ARCHLIB=	yes
 
 USE_TOOLS+=		bison flex gmake
 WRKSRC=			${WRKDIR}/${DISTNAME}/itex-src
diff --git a/textproc/ruby-itex2MML/PLIST b/textproc/ruby-itex2MML/PLIST
index 1648c3d3f8d..4ac29396c4d 100644
--- a/textproc/ruby-itex2MML/PLIST
+++ b/textproc/ruby-itex2MML/PLIST
@@ -1,3 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2008/06/19 14:56:14 taca Exp $
-${RUBY_VENDORARCHLIB}/itex2MML.${RUBY_DLEXT}
+@comment $NetBSD: PLIST,v 1.3 2010/09/10 08:15:55 taca Exp $
+${RUBY_VENDORLIB}/itex_stringsupport.rb
 ${RUBY_VENDORLIB}/itextomml.rb
+${RUBY_VENDORARCHLIB}/itex2MML.${RUBY_DLEXT}
diff --git a/textproc/ruby-itex2MML/distinfo b/textproc/ruby-itex2MML/distinfo
index b03c50fe0c0..72bc06418b6 100644
--- a/textproc/ruby-itex2MML/distinfo
+++ b/textproc/ruby-itex2MML/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2008/06/19 14:56:14 taca Exp $
+$NetBSD: distinfo,v 1.4 2010/09/10 08:15:55 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) = abdc4f3d80878bf69cead0dea8950360495b0040
+SHA1 (itex2MML-1.3.25/itexToMML.tar.gz) = 51295b3bc94eae1c585e41bc675436c6aaf51ab4
+RMD160 (itex2MML-1.3.25/itexToMML.tar.gz) = 0e2877bc8733ee53bd0a62cd12ca331f9a320136
+Size (itex2MML-1.3.25/itexToMML.tar.gz) = 159917 bytes
+SHA1 (patch-aa) = 51ff13b1d433ae3118e70f71d7647e44a983a350
diff --git a/textproc/ruby-itex2MML/patches/patch-aa b/textproc/ruby-itex2MML/patches/patch-aa
index a4b0db965e9..4ecee1c47db 100644
--- a/textproc/ruby-itex2MML/patches/patch-aa
+++ b/textproc/ruby-itex2MML/patches/patch-aa
@@ -1,54 +1,38 @@
-$NetBSD: patch-aa,v 1.2 2008/06/19 14:56:14 taca Exp $
+$NetBSD: patch-aa,v 1.3 2010/09/10 08:15:55 taca Exp $
 
---- Makefile.orig	2007-02-22 17:51:13.000000000 +0000
+* Make ruby and swig commands are settable.
+* support DESTDIR.
+
+--- Makefile.orig	2010-06-09 17:13:08.000000000 +0000
 +++ Makefile
-@@ -1,6 +1,8 @@
+@@ -1,9 +1,8 @@
  #YACC=yacc
  YACC=bison -y  -v
  LEX=flex -P$(YYPREFIX) -olex.yy.c
-+RUBY?=	ruby
-+SWIG?=	swig
+-SWIG=swig
+-RUBY=ruby
+-#RUBY=ruby19
++SWIG?=swig
++RUBY?=ruby
  
  RM=rm -f
  INSTALL=install -c
-@@ -34,19 +36,19 @@ clean:		
- install:	itex2MML
- 		$(INSTALL) itex2MML $(BINDIR)
- 
--RUBY_CFLAGS = $(shell ruby -e 'require "rbconfig"; print Config::CONFIG["CCDLFLAGS"]')
--RUBY_LD = MACOSX_DEPLOYMENT_TARGET=10.4 $(shell ruby -e 'require "rbconfig"; print Config::CONFIG["LDSHARED"]')
--RUBYLIBDIR =$(shell ruby -e 'require "rbconfig"; print Config::CONFIG["libdir"]') 
-+RUBY_CFLAGS = $(shell ${RUBY} -e 'require "rbconfig"; print Config::CONFIG["CCDLFLAGS"]')
-+RUBY_LD = MACOSX_DEPLOYMENT_TARGET=10.4 $(shell ${RUBY} -e 'require "rbconfig"; print Config::CONFIG["LDSHARED"]')
-+RUBYLIBDIR =$(shell ${RUBY} -e 'require "rbconfig"; print Config::CONFIG["libdir"]') 
- RUBY_PREFIX = $(RUBYLIBDIR)/ruby
--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"]')
--LIBRUBYARG = $(shell ruby -e 'require "rbconfig"; print Config::CONFIG["LIBRUBYARG"]')
--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["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"]')
- 
- itex2MML_ruby.c:	itex2MML.i
--			swig -ruby -o itex2MML_ruby.c  itex2MML.i
-+			${SWIG} -ruby -o itex2MML_ruby.c  itex2MML.i
- 
- itex2MML_ruby.o:	itex2MML_ruby.c
- 			$(CC) $(RUBY_CFLAGS) -c itex2MML_ruby.c -I$(RUBYDIR) -o itex2MML_ruby.o
-@@ -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:
--	ruby ./itextomml.rb
-+	${RUBY} ./itextomml.rb
+@@ -44,8 +43,8 @@ RUBY_PREFIX =  $(shell $(RUBY) -e 'requi
+ RUBY_ARCH = $(shell $(RUBY) -e 'require "rbconfig"; print Config::CONFIG["arch"]')
+ RUBYDIR = $(shell $(RUBY) -e 'require "rbconfig"; print Config::CONFIG["archdir"]')
+ RUBYHDRDIR = $(shell $(RUBY) -e 'require "rbconfig"; print Config::CONFIG["rubyhdrdir"]')
+-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"]')
+ RUBY_target_os = $(shell $(RUBY) -e 'require "rbconfig"; print Config::CONFIG["target_os"]')
+@@ -77,5 +76,5 @@ test_ruby:
+ 	$(RUBY) ./itextomml.rb
  
  install_ruby:	itex2MML.$(DYLIB_EXT)
- 	$(INSTALL) itex2MML.$(DYLIB_EXT) $(RUBY_SITEARCHDIR)
--	$(INSTALL) itextomml.rb $(RUBY_SITEDIR)
-+	$(INSTALL) -m 0644 itextomml.rb $(RUBY_SITEDIR)
+-	$(INSTALL) itex2MML.$(DYLIB_EXT) $(RUBY_SITEARCHDIR)
+-	$(INSTALL) itextomml.rb itex_stringsupport.rb $(RUBY_SITEDIR)
++	$(INSTALL) itex2MML.$(DYLIB_EXT) $(DESTDIR)$(RUBY_SITEARCHDIR)
++	$(BSD_INSTALL_DATA) itextomml.rb itex_stringsupport.rb $(DESTDIR)$(RUBY_SITEDIR)