Thu Jun 19 14:56:14 2008 UTC ()
- Switch to use vendor_dir with Ruby 1.8.7.
- And make it build with Ruby 1.8.7, too.

Bump PKGREVISION.


(taca)
diff -r1.3 -r1.4 pkgsrc/textproc/ruby-itex2MML/Makefile
diff -r1.1.1.1 -r1.2 pkgsrc/textproc/ruby-itex2MML/PLIST
diff -r1.2 -r1.3 pkgsrc/textproc/ruby-itex2MML/distinfo
diff -r1.1.1.1 -r1.2 pkgsrc/textproc/ruby-itex2MML/patches/patch-aa
cvs diff -r1.3 -r1.4 pkgsrc/textproc/ruby-itex2MML/Makefile (expand / switch to unified diff)

--- pkgsrc/textproc/ruby-itex2MML/Makefile 2007/06/17 17:32:27 1.3
+++ pkgsrc/textproc/ruby-itex2MML/Makefile 2008/06/19 14:56:14 1.4
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.3 2007/06/17 17:32:27 minskim Exp $ 1# $NetBSD: Makefile,v 1.4 2008/06/19 14:56:14 taca Exp $
2 2
3DISTNAME= itexToMML 3DISTNAME= itexToMML
4PKGNAME= ${RUBY_PKGPREFIX}-itex2MML-${ITEX2MML_VERSION} 4PKGNAME= ${RUBY_PKGPREFIX}-itex2MML-${ITEX2MML_VERSION}
 5PKGREVISION= 1
5CATEGORIES= textproc ruby 6CATEGORIES= textproc ruby
6MASTER_SITES= http://golem.ph.utexas.edu/~distler/blog/files/ 7MASTER_SITES= http://golem.ph.utexas.edu/~distler/blog/files/
7 8
8MAINTAINER= minskim@NetBSD.org 9MAINTAINER= minskim@NetBSD.org
9HOMEPAGE= http://golem.ph.utexas.edu/~distler/blog/itex2MML.html 10HOMEPAGE= http://golem.ph.utexas.edu/~distler/blog/itex2MML.html
10COMMENT= Ruby binding for itex2MML 11COMMENT= Ruby binding for itex2MML
11 12
12BUILD_DEPENDS+= swig>=1.3:../../devel/swig 13BUILD_DEPENDS+= swig>=1.3:../../devel/swig
13 14
14DIST_SUBDIR= itex2MML-${ITEX2MML_VERSION} 15DIST_SUBDIR= itex2MML-${ITEX2MML_VERSION}
15USE_TOOLS+= bison flex gmake 16USE_TOOLS+= bison flex gmake
16WRKSRC= ${WRKDIR}/${DISTNAME}/itex-src 17WRKSRC= ${WRKDIR}/${DISTNAME}/itex-src
17 18
cvs diff -r1.1.1.1 -r1.2 pkgsrc/textproc/ruby-itex2MML/PLIST (expand / switch to unified diff)

--- pkgsrc/textproc/ruby-itex2MML/PLIST 2007/06/14 18:56:59 1.1.1.1
+++ pkgsrc/textproc/ruby-itex2MML/PLIST 2008/06/19 14:56:14 1.2
@@ -1,3 +1,3 @@ @@ -1,3 +1,3 @@
1@comment $NetBSD: PLIST,v 1.1.1.1 2007/06/14 18:56:59 minskim Exp $ 1@comment $NetBSD: PLIST,v 1.2 2008/06/19 14:56:14 taca Exp $
2${RUBY_SITEARCHLIBDIR}/itex2MML.${RUBY_DLEXT} 2${RUBY_VENDORARCHLIB}/itex2MML.${RUBY_DLEXT}
3${RUBY_SITELIBDIR}/itextomml.rb 3${RUBY_VENDORLIB}/itextomml.rb
cvs diff -r1.2 -r1.3 pkgsrc/textproc/ruby-itex2MML/distinfo (expand / switch to unified diff)

--- pkgsrc/textproc/ruby-itex2MML/distinfo 2007/06/17 17:32:27 1.2
+++ pkgsrc/textproc/ruby-itex2MML/distinfo 2008/06/19 14:56:14 1.3
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.2 2007/06/17 17:32:27 minskim Exp $ 1$NetBSD: distinfo,v 1.3 2008/06/19 14:56:14 taca Exp $
2 2
3SHA1 (itex2MML-1.2.3/itexToMML.tar.gz) = cd2dc6e23e2d3dce13b5eaac29e0869a4d35be9d 3SHA1 (itex2MML-1.2.3/itexToMML.tar.gz) = cd2dc6e23e2d3dce13b5eaac29e0869a4d35be9d
4RMD160 (itex2MML-1.2.3/itexToMML.tar.gz) = 6e49bed01c3522a36bfc677fdc76015163d6e55a 4RMD160 (itex2MML-1.2.3/itexToMML.tar.gz) = 6e49bed01c3522a36bfc677fdc76015163d6e55a
5Size (itex2MML-1.2.3/itexToMML.tar.gz) = 127327 bytes 5Size (itex2MML-1.2.3/itexToMML.tar.gz) = 127327 bytes
6SHA1 (patch-aa) = 68660134b805d81d86c6ac7c8a3e591d5705f6be 6SHA1 (patch-aa) = abdc4f3d80878bf69cead0dea8950360495b0040
cvs diff -r1.1.1.1 -r1.2 pkgsrc/textproc/ruby-itex2MML/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/textproc/ruby-itex2MML/patches/patch-aa 2007/06/14 18:56:59 1.1.1.1
+++ pkgsrc/textproc/ruby-itex2MML/patches/patch-aa 2008/06/19 14:56:14 1.2
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1$NetBSD: patch-aa,v 1.1.1.1 2007/06/14 18:56:59 minskim Exp $ 1$NetBSD: patch-aa,v 1.2 2008/06/19 14:56:14 taca Exp $
2 2
3--- Makefile.orig 2007-02-22 09:51:13.000000000 -0800 3--- Makefile.orig 2007-02-22 17:51:13.000000000 +0000
4+++ Makefile 4+++ Makefile
5@@ -1,6 +1,8 @@ 5@@ -1,6 +1,8 @@
6 #YACC=yacc 6 #YACC=yacc
7 YACC=bison -y -v 7 YACC=bison -y -v
8 LEX=flex -P$(YYPREFIX) -olex.yy.c 8 LEX=flex -P$(YYPREFIX) -olex.yy.c
9+RUBY?= ruby 9+RUBY?= ruby
10+SWIG?= swig 10+SWIG?= swig
11  11
12 RM=rm -f 12 RM=rm -f
13 INSTALL=install -c 13 INSTALL=install -c
14@@ -34,19 +36,19 @@ clean:  14@@ -34,19 +36,19 @@ clean:
15 install: itex2MML 15 install: itex2MML
16 $(INSTALL) itex2MML $(BINDIR) 16 $(INSTALL) itex2MML $(BINDIR)
@@ -20,33 +20,35 @@ $NetBSD: patch-aa,v 1.1.1.1 2007/06/14 1 @@ -20,33 +20,35 @@ $NetBSD: patch-aa,v 1.1.1.1 2007/06/14 1
20-RUBYLIBDIR =$(shell ruby -e 'require "rbconfig"; print Config::CONFIG["libdir"]')  20-RUBYLIBDIR =$(shell ruby -e 'require "rbconfig"; print Config::CONFIG["libdir"]')
21+RUBY_CFLAGS = $(shell ${RUBY} -e 'require "rbconfig"; print Config::CONFIG["CCDLFLAGS"]') 21+RUBY_CFLAGS = $(shell ${RUBY} -e 'require "rbconfig"; print Config::CONFIG["CCDLFLAGS"]')
22+RUBY_LD = MACOSX_DEPLOYMENT_TARGET=10.4 $(shell ${RUBY} -e 'require "rbconfig"; print Config::CONFIG["LDSHARED"]') 22+RUBY_LD = MACOSX_DEPLOYMENT_TARGET=10.4 $(shell ${RUBY} -e 'require "rbconfig"; print Config::CONFIG["LDSHARED"]')
23+RUBYLIBDIR =$(shell ${RUBY} -e 'require "rbconfig"; print Config::CONFIG["libdir"]')  23+RUBYLIBDIR =$(shell ${RUBY} -e 'require "rbconfig"; print Config::CONFIG["libdir"]')
24 RUBY_PREFIX = $(RUBYLIBDIR)/ruby 24 RUBY_PREFIX = $(RUBYLIBDIR)/ruby
25-RUBY_ARCH = $(shell ruby -e 'require "rbconfig"; print Config::CONFIG["arch"]') 25-RUBY_ARCH = $(shell ruby -e 'require "rbconfig"; print Config::CONFIG["arch"]')
26-RUBYDIR = $(shell ruby -e 'require "rbconfig"; print Config::CONFIG["archdir"]') 26-RUBYDIR = $(shell ruby -e 'require "rbconfig"; print Config::CONFIG["archdir"]')
27-RUBY_SITEDIR = $(shell ruby -e 'require "rbconfig"; print Config::CONFIG["sitelibdir"]') 27-RUBY_SITEDIR = $(shell ruby -e 'require "rbconfig"; print Config::CONFIG["sitelibdir"]')
28-RUBY_SITEARCHDIR = $(shell ruby -e 'require "rbconfig"; print Config::CONFIG["sitearchdir"]') 28-RUBY_SITEARCHDIR = $(shell ruby -e 'require "rbconfig"; print Config::CONFIG["sitearchdir"]')
29-LIBRUBYARG = $(shell ruby -e 'require "rbconfig"; print Config::CONFIG["LIBRUBYARG"]') 29-LIBRUBYARG = $(shell ruby -e 'require "rbconfig"; print Config::CONFIG["LIBRUBYARG"]')
30-DYLIB_EXT = $(shell ruby -e 'require "rbconfig"; print Config::CONFIG["DLEXT"]') 30-DYLIB_EXT = $(shell ruby -e 'require "rbconfig"; print Config::CONFIG["DLEXT"]')
31+RUBY_ARCH = $(shell ${RUBY} -e 'require "rbconfig"; print Config::CONFIG["arch"]') 31+RUBY_ARCH = $(shell ${RUBY} -e 'require "rbconfig"; print Config::CONFIG["arch"]')
32+RUBYDIR = $(shell ${RUBY} -e 'require "rbconfig"; print Config::CONFIG["archdir"]') 32+RUBYDIR = $(shell ${RUBY} -e 'require "rbconfig"; print Config::CONFIG["archdir"]')
33+RUBY_SITEDIR = $(shell ${RUBY} -e 'require "rbconfig"; print Config::CONFIG["sitelibdir"]') 33+RUBY_SITEDIR = $(shell ${RUBY} -e 'require "rbconfig"; print Config::CONFIG["vendorlibdir"]')
34+RUBY_SITEARCHDIR = $(shell ${RUBY} -e 'require "rbconfig"; print Config::CONFIG["sitearchdir"]') 34+RUBY_SITEARCHDIR = $(shell ${RUBY} -e 'require "rbconfig"; print Config::CONFIG["vendorarchdir"]')
35+LIBRUBYARG = $(shell ${RUBY} -e 'require "rbconfig"; print Config::CONFIG["LIBRUBYARG"]') 35+LIBRUBYARG = $(shell ${RUBY} -e 'require "rbconfig"; print Config::CONFIG["LIBRUBYARG"]')
36+DYLIB_EXT = $(shell ${RUBY} -e 'require "rbconfig"; print Config::CONFIG["DLEXT"]') 36+DYLIB_EXT = $(shell ${RUBY} -e 'require "rbconfig"; print Config::CONFIG["DLEXT"]')
37  37
38 itex2MML_ruby.c: itex2MML.i 38 itex2MML_ruby.c: itex2MML.i
39- swig -ruby -o itex2MML_ruby.c itex2MML.i 39- swig -ruby -o itex2MML_ruby.c itex2MML.i
40+ ${SWIG} -ruby -o itex2MML_ruby.c itex2MML.i 40+ ${SWIG} -ruby -o itex2MML_ruby.c itex2MML.i
41  41
42 itex2MML_ruby.o: itex2MML_ruby.c 42 itex2MML_ruby.o: itex2MML_ruby.c
43 $(CC) $(RUBY_CFLAGS) -c itex2MML_ruby.c -I$(RUBYDIR) -o itex2MML_ruby.o 43 $(CC) $(RUBY_CFLAGS) -c itex2MML_ruby.c -I$(RUBYDIR) -o itex2MML_ruby.o
44@@ -61,7 +63,7 @@ ruby: itex2MML_ruby.o y.tab_ruby.o lex.y 44@@ -61,8 +63,8 @@ ruby: itex2MML_ruby.o y.tab_ruby.o lex.y
45 $(RUBY_LD) itex2MML_ruby.o y.tab_ruby.o lex.yy_ruby.o -L$(RUBYLIBDIR) $(LIBRUBYARG) -o itex2MML.$(DYLIB_EXT) 45 $(RUBY_LD) itex2MML_ruby.o y.tab_ruby.o lex.yy_ruby.o -L$(RUBYLIBDIR) $(LIBRUBYARG) -o itex2MML.$(DYLIB_EXT)
46  46
47 test_ruby: 47 test_ruby:
48- ruby ./itextomml.rb 48- ruby ./itextomml.rb
49+ ${RUBY} ./itextomml.rb 49+ ${RUBY} ./itextomml.rb
50  50
51 install_ruby: itex2MML.$(DYLIB_EXT) 51 install_ruby: itex2MML.$(DYLIB_EXT)
52 $(INSTALL) itex2MML.$(DYLIB_EXT) $(RUBY_SITEARCHDIR) 52 $(INSTALL) itex2MML.$(DYLIB_EXT) $(RUBY_SITEARCHDIR)
 53- $(INSTALL) itextomml.rb $(RUBY_SITEDIR)
 54+ $(INSTALL) -m 0644 itextomml.rb $(RUBY_SITEDIR)