From d87262dd706fec50cd150aab3e93883b6337466d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 20:56:41 +0100 Subject: gentoo resync : 14.07.2018 --- .../files/hyperestraier-configure.patch | 294 --------------------- .../hyperestraier/files/hyperestraier-perl.patch | 24 -- .../hyperestraier/files/hyperestraier-ruby19.patch | 146 ---------- 3 files changed, 464 deletions(-) delete mode 100644 app-text/hyperestraier/files/hyperestraier-configure.patch delete mode 100644 app-text/hyperestraier/files/hyperestraier-perl.patch delete mode 100644 app-text/hyperestraier/files/hyperestraier-ruby19.patch (limited to 'app-text/hyperestraier/files') diff --git a/app-text/hyperestraier/files/hyperestraier-configure.patch b/app-text/hyperestraier/files/hyperestraier-configure.patch deleted file mode 100644 index 4e747d9c754b..000000000000 --- a/app-text/hyperestraier/files/hyperestraier-configure.patch +++ /dev/null @@ -1,294 +0,0 @@ ---- a/configure.in -+++ b/configure.in -@@ -24,24 +24,6 @@ - MYRUNPATH="" - MYPOSTCMD="true" - --# Building paths --pathtmp="$PATH" --PATH="$HOME/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin" --PATH="$PATH:/usr/ccs/bin:/usr/ucb:/usr/xpg4/bin:/usr/xpg6/bin:$pathtmp" --LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LIBRARY_PATH" --LD_LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LD_LIBRARY_PATH" --CPATH="$HOME/include:/usr/local/include:$CPATH" --PKG_CONFIG_PATH="$HOME/lib/pkgconfig:/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH" --export PATH LIBRARY_PATH LD_LIBRARY_PATH CPATH PKG_CONFIG_PATH --if type pkg-config > /dev/null 2>&1 --then -- PATH="$PATH:`pkg-config --variable=bindir qdbm`" -- LIBRARY_PATH="$LIBRARY_PATH:`pkg-config --variable=libdir qdbm`" -- LD_LIBRARY_PATH="$LD_LIBRARY_PATH:`pkg-config --variable=libdir qdbm`" -- CPATH="$CPATH:`pkg-config --variable=includedir qdbm`" -- export PATH LIBRARY_PATH LD_LIBRARY_PATH CPATH PKG_CONFIG_PATH --fi -- - - - #================================================================ -@@ -60,7 +42,6 @@ - then - MYCFLAGS="-Wall -ansi -pedantic -fPIC -fsigned-char -g" - MYDEFS="" -- MYLDOPTS="-static" - enables="$enables (debug)" - stable="yes" - fi -@@ -187,19 +169,20 @@ - fi - - # Underlying libraries -+PKG_PROG_PKG_CONFIG - AC_CHECK_LIB(c, main) - AC_CHECK_LIB(m, main) - AC_CHECK_LIB(regex, main) - AC_CHECK_LIB(iconv, main) --if test "$enable_zlib" != "no" || pkg-config --libs qdbm 2>&1 | grep '\-lz' > /dev/null 2>&1 -+if test "$enable_zlib" != "no" || $PKG_CONFIG --libs qdbm 2>&1 | grep '\-lz' > /dev/null 2>&1 - then - AC_CHECK_LIB(z, main) - fi --if test "$enable_lzo" = "yes" || pkg-config --libs qdbm 2>&1 | grep '\-llzo2' > /dev/null 2>&1 -+if test "$enable_lzo" = "yes" || $PKG_CONFIG --libs qdbm 2>&1 | grep '\-llzo2' > /dev/null 2>&1 - then - AC_CHECK_LIB(lzo2, main) - fi --if test "$enable_bzip" = "yes" || pkg-config --libs qdbm 2>&1 | grep '\-lbz2' > /dev/null 2>&1 -+if test "$enable_bzip" = "yes" || $PKG_CONFIG --libs qdbm 2>&1 | grep '\-lbz2' > /dev/null 2>&1 - then - AC_CHECK_LIB(bz2, main) - fi -@@ -227,15 +210,15 @@ - fi - - # Checking the version of QDBM with pkg-config --if type pkg-config > /dev/null 2>&1 -+if true - then - printf 'checking the version of QDBM ... ' -- if pkg-config --atleast-version=1.8.75 qdbm -+ if $PKG_CONFIG --atleast-version=1.8.75 qdbm - then -- printf 'ok (%s)\n' `pkg-config --modversion qdbm` -- MYCPPOPTS="$MYCPPOPTS -I`pkg-config --variable=includedir qdbm`" -- MYLDOPTS="$MYLDOPTS -L`pkg-config --variable=libdir qdbm`" -- MYRUNPATH="$MYRUNPATH:`pkg-config --variable=libdir qdbm`" -+ printf 'ok (%s)\n' `$PKG_CONFIG --modversion qdbm` -+ MYCPPOPTS="$MYCPPOPTS -I`$PKG_CONFIG --variable=includedir qdbm`" -+ MYLDOPTS="$MYLDOPTS -L`$PKG_CONFIG --variable=libdir qdbm`" -+ MYRUNPATH="$MYRUNPATH:`$PKG_CONFIG --variable=libdir qdbm`" - else - printf 'no (maybe not installed or too old)\n' - fi ---- a/javanative/configure.in -+++ b/javanative/configure.in -@@ -27,28 +27,6 @@ - MYSKLIBS="" - MYRUNPATH="" - --# Building paths --pathtmp="$PATH" --PATH="..:$HOME/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin" --PATH="$PATH:/usr/ccs/bin:/usr/ucb:/usr/xpg4/bin:/usr/xpg6/bin:$pathtmp" --LIBRARY_PATH="..:$HOME/lib:/usr/local/lib:$LIBRARY_PATH" --LD_LIBRARY_PATH="..:$HOME/lib:/usr/local/lib:$LD_LIBRARY_PATH" --CPATH="..:$HOME/include:/usr/local/include:$CPATH" --PKG_CONFIG_PATH="..:$HOME/lib/pkgconfig:/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH" --export PATH LIBRARY_PATH LD_LIBRARY_PATH CPATH PKG_CONFIG_PATH --if type pkg-config > /dev/null 2>&1 --then -- PATH="$PATH:`pkg-config --variable=bindir qdbm`" -- PATH="$PATH:`pkg-config --variable=bindir hyperestraier`" -- LIBRARY_PATH="$LIBRARY_PATH:`pkg-config --variable=libdir qdbm`" -- LIBRARY_PATH="$LIBRARY_PATH:`pkg-config --variable=libdir hyperestraier`" -- LD_LIBRARY_PATH="$LD_LIBRARY_PATH:`pkg-config --variable=libdir qdbm`" -- LD_LIBRARY_PATH="$LD_LIBRARY_PATH:`pkg-config --variable=libdir hyperestraier`" -- CPATH="$CPATH:`pkg-config --variable=includedir qdbm`" -- CPATH="$CPATH:`pkg-config --variable=includedir hyperestraier`" -- export PATH LIBRARY_PATH LD_LIBRARY_PATH CPATH PKG_CONFIG_PATH --fi -- - - - #================================================================ -@@ -158,7 +136,7 @@ - AC_CHECK_LIB(lzo2, main) - AC_CHECK_LIB(bz2, main) - AC_CHECK_LIB(qdbm, main) --AC_CHECK_LIB(estraier, main) -+LIBS="$LIBS -lestraier" - - # For libraries of pthreads - AC_CHECK_LIB(pthread, main, MYMTLIBS="-lpthread $MYMTLIBS", -@@ -170,11 +148,12 @@ - AC_CHECK_LIB(resolv, main, MYSKLIBS="-lresolv $MYSKLIBS") - - # Checking the version of QDBM with pkg-config --if type pkg-config > /dev/null 2>&1 && pkg-config --atleast-version=1.0.0 qdbm -+PKG_PROG_PKG_CONFIG -+if $PKG_CONFIG --atleast-version=1.0.0 qdbm - then -- MYCPPOPTS="$MYCPPOPTS -I`pkg-config --variable=includedir qdbm`" -- MYLDOPTS="$MYLDOPTS -L`pkg-config --variable=libdir qdbm`" -- MYRUNPATH="$MYRUNPATH:`pkg-config --variable=libdir qdbm`" -+ MYCPPOPTS="$MYCPPOPTS -I`$PKG_CONFIG --variable=includedir qdbm`" -+ MYLDOPTS="$MYLDOPTS -L`$PKG_CONFIG --variable=libdir qdbm`" -+ MYRUNPATH="$MYRUNPATH:`$PKG_CONFIG --variable=libdir qdbm`" - fi - - ---- a/javapure/configure.in -+++ b/javapure/configure.in -@@ -21,28 +21,6 @@ - JAVADOC="javadoc" - JAVARUN="java" - --# Building paths --pathtmp="$PATH" --PATH="..:$HOME/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin" --PATH="$PATH:/usr/ccs/bin:/usr/ucb:/usr/xpg4/bin:/usr/xpg6/bin:$pathtmp" --LIBRARY_PATH="..:$HOME/lib:/usr/local/lib:$LIBRARY_PATH" --LD_LIBRARY_PATH="..:$HOME/lib:/usr/local/lib:$LD_LIBRARY_PATH" --CPATH="..:$HOME/include:/usr/local/include:$CPATH" --PKG_CONFIG_PATH="..:$HOME/lib/pkgconfig:/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH" --export PATH LIBRARY_PATH LD_LIBRARY_PATH CPATH PKG_CONFIG_PATH --if type pkg-config > /dev/null 2>&1 --then -- PATH="$PATH:`pkg-config --variable=bindir qdbm`" -- PATH="$PATH:`pkg-config --variable=bindir hyperestraier`" -- LIBRARY_PATH="$LIBRARY_PATH:`pkg-config --variable=libdir qdbm`" -- LIBRARY_PATH="$LIBRARY_PATH:`pkg-config --variable=libdir hyperestraier`" -- LD_LIBRARY_PATH="$LD_LIBRARY_PATH:`pkg-config --variable=libdir qdbm`" -- LD_LIBRARY_PATH="$LD_LIBRARY_PATH:`pkg-config --variable=libdir hyperestraier`" -- CPATH="$CPATH:`pkg-config --variable=includedir qdbm`" -- CPATH="$CPATH:`pkg-config --variable=includedir hyperestraier`" -- export PATH LIBRARY_PATH LD_LIBRARY_PATH CPATH PKG_CONFIG_PATH --fi -- - - - #================================================================ ---- a/perlnative/configure.in -+++ b/perlnative/configure.in -@@ -17,28 +17,6 @@ - MYPLLIBDIR=/usr/lib/perl5/site_perl - MYRUNPATH="" - --# Building paths --pathtmp="$PATH" --PATH="..:$HOME/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin" --PATH="$PATH:/usr/ccs/bin:/usr/ucb:/usr/xpg4/bin:/usr/xpg6/bin:$pathtmp" --LIBRARY_PATH="..:$HOME/lib:/usr/local/lib:$LIBRARY_PATH" --LD_LIBRARY_PATH="..:$HOME/lib:/usr/local/lib:$LD_LIBRARY_PATH" --CPATH="..:$HOME/include:/usr/local/include:$CPATH" --PKG_CONFIG_PATH="..:$HOME/lib/pkgconfig:/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH" --export PATH LIBRARY_PATH LD_LIBRARY_PATH CPATH PKG_CONFIG_PATH --if type pkg-config > /dev/null 2>&1 --then -- PATH="$PATH:`pkg-config --variable=bindir qdbm`" -- PATH="$PATH:`pkg-config --variable=bindir hyperestraier`" -- LIBRARY_PATH="$LIBRARY_PATH:`pkg-config --variable=libdir qdbm`" -- LIBRARY_PATH="$LIBRARY_PATH:`pkg-config --variable=libdir hyperestraier`" -- LD_LIBRARY_PATH="$LD_LIBRARY_PATH:`pkg-config --variable=libdir qdbm`" -- LD_LIBRARY_PATH="$LD_LIBRARY_PATH:`pkg-config --variable=libdir hyperestraier`" -- CPATH="$CPATH:`pkg-config --variable=includedir qdbm`" -- CPATH="$CPATH:`pkg-config --variable=includedir hyperestraier`" -- export PATH LIBRARY_PATH LD_LIBRARY_PATH CPATH PKG_CONFIG_PATH --fi -- - # Setting the default prefix - if test "$prefix" = NONE - then -@@ -100,12 +78,13 @@ - AC_CHECK_LIB(lzo2, main) - AC_CHECK_LIB(bz2, main) - AC_CHECK_LIB(qdbm, main) --AC_CHECK_LIB(estraier, main) -+LIBS="$LIBS -lestraier" - - # Checking the version of QDBM with pkg-config --if type pkg-config > /dev/null 2>&1 && pkg-config --atleast-version=1.0.0 qdbm -+PKG_PROG_PKG_CONFIG -+if $PKG_CONFIG --atleast-version=1.0.0 qdbm - then -- MYRUNPATH="$MYRUNPATH:`pkg-config --variable=libdir qdbm`" -+ MYRUNPATH="$MYRUNPATH:`$PKG_CONFIG --variable=libdir qdbm`" - fi - - ---- a/rubynative/configure.in -+++ b/rubynative/configure.in -@@ -16,28 +16,6 @@ - MYRBLIBDIR=/usr/local/lib/ruby/site_ruby - MYRUNPATH="" - --# Building paths --pathtmp="$PATH" --PATH="..:$HOME/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin" --PATH="$PATH:/usr/ccs/bin:/usr/ucb:/usr/xpg4/bin:/usr/xpg6/bin:$pathtmp" --LIBRARY_PATH="..:$HOME/lib:/usr/local/lib:$LIBRARY_PATH" --LD_LIBRARY_PATH="..:$HOME/lib:/usr/local/lib:$LD_LIBRARY_PATH" --CPATH="..:$HOME/include:/usr/local/include:$CPATH" --PKG_CONFIG_PATH="..:$HOME/lib/pkgconfig:/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH" --export PATH LIBRARY_PATH LD_LIBRARY_PATH CPATH PKG_CONFIG_PATH --if type pkg-config > /dev/null 2>&1 --then -- PATH="$PATH:`pkg-config --variable=bindir qdbm`" -- PATH="$PATH:`pkg-config --variable=bindir hyperestraier`" -- LIBRARY_PATH="$LIBRARY_PATH:`pkg-config --variable=libdir qdbm`" -- LIBRARY_PATH="$LIBRARY_PATH:`pkg-config --variable=libdir hyperestraier`" -- LD_LIBRARY_PATH="$LD_LIBRARY_PATH:`pkg-config --variable=libdir qdbm`" -- LD_LIBRARY_PATH="$LD_LIBRARY_PATH:`pkg-config --variable=libdir hyperestraier`" -- CPATH="$CPATH:`pkg-config --variable=includedir qdbm`" -- CPATH="$CPATH:`pkg-config --variable=includedir hyperestraier`" -- export PATH LIBRARY_PATH LD_LIBRARY_PATH CPATH PKG_CONFIG_PATH --fi -- - # Setting the default prefix - if test "$prefix" = NONE - then -@@ -74,10 +52,11 @@ - MYRBLIBDIR="$myrblibdir" - fi - --# Checking the version of QDBM with pkg-config --if type pkg-config > /dev/null 2>&1 && pkg-config --atleast-version=1.0.0 qdbm -+# Checking the version of QDBM with $PKG_CONFIG -+PKG_PROG_PKG_CONFIG -+if $PKG_CONFIG --atleast-version=1.0.0 qdbm - then -- MYRUNPATH="$MYRUNPATH:`pkg-config --variable=libdir qdbm`" -+ MYRUNPATH="$MYRUNPATH:`$PKG_CONFIG --variable=libdir qdbm`" - fi - - ---- a/rubypure/configure.in -+++ b/rubypure/configure.in -@@ -15,28 +15,6 @@ - RDOC="rdoc" - MYRBLIBDIR=/usr/local/lib/ruby/site_ruby - --# Building paths --pathtmp="$PATH" --PATH="..:$HOME/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin" --PATH="$PATH:/usr/ccs/bin:/usr/ucb:/usr/xpg4/bin:/usr/xpg6/bin:$pathtmp" --LIBRARY_PATH="..:$HOME/lib:/usr/local/lib:$LIBRARY_PATH" --LD_LIBRARY_PATH="..:$HOME/lib:/usr/local/lib:$LD_LIBRARY_PATH" --CPATH="..:$HOME/include:/usr/local/include:$CPATH" --PKG_CONFIG_PATH="..:$HOME/lib/pkgconfig:/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH" --export PATH LIBRARY_PATH LD_LIBRARY_PATH CPATH PKG_CONFIG_PATH --if type pkg-config > /dev/null 2>&1 --then -- PATH="$PATH:`pkg-config --variable=bindir qdbm`" -- PATH="$PATH:`pkg-config --variable=bindir hyperestraier`" -- LIBRARY_PATH="$LIBRARY_PATH:`pkg-config --variable=libdir qdbm`" -- LIBRARY_PATH="$LIBRARY_PATH:`pkg-config --variable=libdir hyperestraier`" -- LD_LIBRARY_PATH="$LD_LIBRARY_PATH:`pkg-config --variable=libdir qdbm`" -- LD_LIBRARY_PATH="$LD_LIBRARY_PATH:`pkg-config --variable=libdir hyperestraier`" -- CPATH="$CPATH:`pkg-config --variable=includedir qdbm`" -- CPATH="$CPATH:`pkg-config --variable=includedir hyperestraier`" -- export PATH LIBRARY_PATH LD_LIBRARY_PATH CPATH PKG_CONFIG_PATH --fi -- - # Setting the default prefix - if test "$prefix" = NONE - then diff --git a/app-text/hyperestraier/files/hyperestraier-perl.patch b/app-text/hyperestraier/files/hyperestraier-perl.patch deleted file mode 100644 index dbafd483d926..000000000000 --- a/app-text/hyperestraier/files/hyperestraier-perl.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- a/perlnative/Makefile.in -+++ b/perlnative/Makefile.in -@@ -29,10 +29,10 @@ - # Building binaries - PERL = @PERL@ - POD2HTML = @POD2HTML@ --CC = gcc -+CC = @CC@ - INC = -I. -I../.. -I$(MYHEADDIR) -I$(HOME)/include -I/usr/local/include - OPTIMIZE = @MYOPTIMIZE@ --LD = gcc -+LD = @CC@ - LIBS = -L../.. -L$(MYLIBDIR) -L$(HOME)/lib -L/usr/local/lib @LIBS@ - RUNENV = LD_LIBRARY_PATH=.:..:/lib:/usr/lib:$(MYLIBDIR):$(HOME)/lib:/usr/local/lib:@MYRUNPATH@ - -@@ -46,7 +46,7 @@ - all : - ( cd src && if ! [ -f Makefile ] ; \ - then $(RUNENV) $(PERL) Makefile.PL CC="$(CC)" INC="$(INC)" OPTIMIZE="$(OPTIMIZE)" \ -- LD="$(LD)" LIBS="$(LIBS)" PREFIX="$(prefix)" ; fi ) -+ LD="$(LD)" LIBS="$(LIBS)" PREFIX="$(prefix)" INSTALLDIRS="vendor" ; fi ) - ( cd src && make ) - @printf '\n' - @printf '#================================================================\n' diff --git a/app-text/hyperestraier/files/hyperestraier-ruby19.patch b/app-text/hyperestraier/files/hyperestraier-ruby19.patch deleted file mode 100644 index 25d8ffad7daa..000000000000 --- a/app-text/hyperestraier/files/hyperestraier-ruby19.patch +++ /dev/null @@ -1,146 +0,0 @@ ---- a/rubynative/Makefile.in -+++ b/rubynative/Makefile.in -@@ -82,21 +82,21 @@ - - check : - rm -rf casket -- $(RUNENV) $(RUBY) -I./src -w -d estcmd.rb put casket ../misc/test001.est -- $(RUNENV) $(RUBY) -I./src -w -d estcmd.rb put casket ../misc/test002.est -- $(RUNENV) $(RUBY) -I./src -w -d estcmd.rb put casket ../misc/test003.est -- $(RUNENV) $(RUBY) -I./src -w -d estcmd.rb put casket ../misc/test004.est -- $(RUNENV) $(RUBY) -I./src -w -d estcmd.rb put casket ../misc/test005.est -- $(RUNENV) $(RUBY) -I./src -w -d estcmd.rb put casket ../misc/test006.est -- $(RUNENV) $(RUBY) -I./src -w -d estcmd.rb edit casket 1 "@title" "java" -- $(RUNENV) $(RUBY) -I./src -w -d estcmd.rb get casket 1 -- $(RUNENV) $(RUBY) -I./src -w -d estcmd.rb get casket 1 "@title" -- $(RUNENV) $(RUBY) -I./src -w -d estcmd.rb out casket 1 -- $(RUNENV) $(RUBY) -I./src -w -d estcmd.rb inform casket -- $(RUNENV) $(RUBY) -I./src -w -d estcmd.rb optimize casket -- $(RUNENV) $(RUBY) -I./src -w -d estcmd.rb search \ -+ $(RUNENV) $(RUBY) -I./src -I. -w -d estcmd.rb put casket ../misc/test001.est -+ $(RUNENV) $(RUBY) -I./src -I. -w -d estcmd.rb put casket ../misc/test002.est -+ $(RUNENV) $(RUBY) -I./src -I. -w -d estcmd.rb put casket ../misc/test003.est -+ $(RUNENV) $(RUBY) -I./src -I. -w -d estcmd.rb put casket ../misc/test004.est -+ $(RUNENV) $(RUBY) -I./src -I. -w -d estcmd.rb put casket ../misc/test005.est -+ $(RUNENV) $(RUBY) -I./src -I. -w -d estcmd.rb put casket ../misc/test006.est -+ $(RUNENV) $(RUBY) -I./src -I. -w -d estcmd.rb edit casket 1 "@title" "java" -+ $(RUNENV) $(RUBY) -I./src -I. -w -d estcmd.rb get casket 1 -+ $(RUNENV) $(RUBY) -I./src -I. -w -d estcmd.rb get casket 1 "@title" -+ $(RUNENV) $(RUBY) -I./src -I. -w -d estcmd.rb out casket 1 -+ $(RUNENV) $(RUBY) -I./src -I. -w -d estcmd.rb inform casket -+ $(RUNENV) $(RUBY) -I./src -I. -w -d estcmd.rb optimize casket -+ $(RUNENV) $(RUBY) -I./src -I. -w -d estcmd.rb search \ - -vf -cd casket "estraier" > check.out -- $(RUNENV) $(RUBY) -I./src -w -d estcmd.rb search \ -+ $(RUNENV) $(RUBY) -I./src -I. -w -d estcmd.rb search \ - -vs -gs -attr "@uri" -ord "@mdate NUMD" -max 1 casket "estraier OR mikio" > check.out - rm -rf casket - ---- a/rubynative/configure.in -+++ b/rubynative/configure.in -@@ -41,7 +41,7 @@ - # Setting the default prefix - if test "$prefix" = NONE - then -- prefix=`ruby -rrbconfig -e 'puts(Config::CONFIG.fetch("prefix"))'` -+ prefix=`ruby -rrbconfig -e 'puts(RbConfig::CONFIG.fetch("prefix"))'` - fi - - -@@ -68,7 +68,7 @@ - printf '%s\n' "$RDOC" - - # Librarh path --myrblibdir=`ruby -rrbconfig -e 'puts(Config::CONFIG.fetch("sitelibdir"))'` -+myrblibdir=`ruby -rrbconfig -e 'puts(RbConfig::CONFIG.fetch("sitelibdir"))'` - if test -n "$myrblibdir" - then - MYRBLIBDIR="$myrblibdir" ---- a/rubynative/src/estraier.c -+++ b/rubynative/src/estraier.c -@@ -24,6 +24,16 @@ - #define VNINFO "@informer" - #define VNCOND "@cond" - -+#ifndef RSTRING_PTR -+# define RSTRING_PTR(s) (RSTRING(s)->ptr) -+#endif -+#ifndef RSTRING_LEN -+# define RSTRING_LEN(s) (RSTRING(s)->len) -+#endif -+#ifndef RARRAY_LEN -+# define RARRAY_LEN(a) (RARRAY(a)->len) -+#endif -+ - typedef struct { - int *ids; - int *dbidxs; -@@ -351,7 +361,7 @@ - vdoc = rb_iv_get(vself, VNDATA); - Data_Get_Struct(vdoc, ESTDOC, doc); - Check_Type(vwords, T_ARRAY); -- len = RARRAY(vwords)->len; -+ len = RARRAY_LEN(vwords); - for(i = 0; i < len; i++){ - Check_Type(rb_ary_entry(vwords, i), T_STRING); - } -@@ -764,7 +774,7 @@ - CBMAP *hints; - int i, dnum, *res, rnum; - Check_Type(vdbs, T_ARRAY); -- dnum = RARRAY(vdbs)->len; -+ dnum = RARRAY_LEN(vdbs); - dbs = cbmalloc(dnum * sizeof(ESTMTDB *) + 1); - for(i = 0; i < dnum; i++){ - vdb = rb_ary_entry(vdbs, i); -@@ -1189,10 +1199,10 @@ - VALUE str; - int i, len; - list = cblistopen(); -- len = RARRAY(obj)->len; -+ len = RARRAY_LEN(obj); - for(i = 0; i < len; i++){ - str = rb_ary_entry(obj, i); -- cblistpush(list, RSTRING(str)->ptr, RSTRING(str)->len); -+ cblistpush(list, RSTRING_PTR(str), RSTRING_LEN(str)); - } - return list; - } -@@ -1218,14 +1228,14 @@ - int i, len; - map = cbmapopenex(31); - keys = rb_funcall(obj, rb_intern("keys"), 0); -- len = RARRAY(keys)->len; -+ len = RARRAY_LEN(keys); - for(i = 0; i < len; i++){ - key = rb_ary_entry(keys, i); - val = rb_hash_aref(obj, key); - key = rb_String(key); - val = rb_String(val); -- cbmapput(map, RSTRING(key)->ptr, RSTRING(key)->len, -- RSTRING(val)->ptr, RSTRING(val)->len, 0); -+ cbmapput(map, RSTRING_PTR(key), RSTRING_LEN(key), -+ RSTRING_PTR(val), RSTRING_LEN(val), 0); - } - return map; - } ---- a/rubypure/configure.in -+++ b/rubypure/configure.in -@@ -40,7 +40,7 @@ - # Setting the default prefix - if test "$prefix" = NONE - then -- prefix=`ruby -rrbconfig -e 'puts(Config::CONFIG.fetch("prefix"))'` -+ prefix=`ruby -rrbconfig -e 'puts(RbConfig::CONFIG.fetch("prefix"))'` - fi - - -@@ -67,7 +67,7 @@ - printf '%s\n' "$RDOC" - - # Librarh path --myrblibdir=`ruby -rrbconfig -e 'puts(Config::CONFIG.fetch("sitelibdir"))'` -+myrblibdir=`ruby -rrbconfig -e 'puts(RbConfig::CONFIG.fetch("sitelibdir"))'` - if test -n "$myrblibdir" - then - MYRBLIBDIR="$myrblibdir" -- cgit v1.2.3