Thu Jun 11 15:14:14 2015 UTC ()
Allow ruby-native-hyperestraier and ruby-pure-hyperestraier packages
build on Ruby 2.2.


(taca)
diff -r1.30 -r1.31 pkgsrc/textproc/hyperestraier/distinfo
diff -r1.4 -r1.5 pkgsrc/textproc/hyperestraier/patches/patch-ad
diff -r1.2 -r1.3 pkgsrc/textproc/hyperestraier/patches/patch-ae
cvs diff -r1.30 -r1.31 pkgsrc/textproc/hyperestraier/distinfo (expand / switch to unified diff)

--- pkgsrc/textproc/hyperestraier/distinfo 2013/10/20 17:49:58 1.30
+++ pkgsrc/textproc/hyperestraier/distinfo 2015/06/11 15:14:14 1.31
@@ -1,12 +1,12 @@ @@ -1,12 +1,12 @@
1$NetBSD: distinfo,v 1.30 2013/10/20 17:49:58 joerg Exp $ 1$NetBSD: distinfo,v 1.31 2015/06/11 15:14:14 taca Exp $
2 2
3SHA1 (hyperestraier-1.4.13.tar.gz) = 21c3f325f42019fef096172105c2fc16f3e72fc0 3SHA1 (hyperestraier-1.4.13.tar.gz) = 21c3f325f42019fef096172105c2fc16f3e72fc0
4RMD160 (hyperestraier-1.4.13.tar.gz) = 8af0af25df6d5bd45a09e9abfbb26300339b5a2c 4RMD160 (hyperestraier-1.4.13.tar.gz) = 8af0af25df6d5bd45a09e9abfbb26300339b5a2c
5Size (hyperestraier-1.4.13.tar.gz) = 1014600 bytes 5Size (hyperestraier-1.4.13.tar.gz) = 1014600 bytes
6SHA1 (patch-aa) = 67e563ac93b2b3e09122d3fcd12fc443d437fdb3 6SHA1 (patch-aa) = 67e563ac93b2b3e09122d3fcd12fc443d437fdb3
7SHA1 (patch-ab) = f3f57404f02ff9928adc0a8c5c9ddec65700ce85 7SHA1 (patch-ab) = f3f57404f02ff9928adc0a8c5c9ddec65700ce85
8SHA1 (patch-ac) = 06bc0a56cc3a7592995d615a1afbffce8fb99931 8SHA1 (patch-ac) = 06bc0a56cc3a7592995d615a1afbffce8fb99931
9SHA1 (patch-ad) = 519ec64e5e87b5de00a488b4d19d82fe336724f4 9SHA1 (patch-ad) = 1ac7dad8bc89fc8bba945a89fa771b925daed7bf
10SHA1 (patch-ae) = fcde455f65834f004897805b61de40b1171ae6dd 10SHA1 (patch-ae) = 61621529c87c9040b8b948f03d461111c8488644
11SHA1 (patch-af) = 24ba33d20fc9b23cbc91c8345d2250db14dab536 11SHA1 (patch-af) = 24ba33d20fc9b23cbc91c8345d2250db14dab536
12SHA1 (patch-rubynative_src_extconf.rb) = fbe2f3b3156a04a4d8ed78719dc429070eb9a559 12SHA1 (patch-rubynative_src_extconf.rb) = fbe2f3b3156a04a4d8ed78719dc429070eb9a559
cvs diff -r1.4 -r1.5 pkgsrc/textproc/hyperestraier/patches/patch-ad (expand / switch to unified diff)

--- pkgsrc/textproc/hyperestraier/patches/patch-ad 2008/06/19 15:18:31 1.4
+++ pkgsrc/textproc/hyperestraier/patches/patch-ad 2015/06/11 15:14:14 1.5
@@ -1,18 +1,21 @@ @@ -1,18 +1,21 @@
1$NetBSD: patch-ad,v 1.4 2008/06/19 15:18:31 taca Exp $ 1$NetBSD: patch-ad,v 1.5 2015/06/11 15:14:14 taca Exp $
 2
 3* Do not guess paths.
 4* Fix build problem on Ruby 2.2 and later.
2 5
3--- rubynative/configure.orig 2007-12-25 01:53:40.000000000 +0000 6--- rubynative/configure.orig 2007-12-25 01:53:40.000000000 +0000
4+++ rubynative/configure 7+++ rubynative/configure
5@@ -1233,27 +1233,6 @@ RDOC="rdoc" 8@@ -1233,32 +1233,11 @@ RDOC="rdoc"
6 MYRBLIBDIR=/usr/local/lib/ruby/site_ruby 9 MYRBLIBDIR=/usr/local/lib/ruby/site_ruby
7 MYRUNPATH="" 10 MYRUNPATH=""
8  11
9-# Building paths 12-# Building paths
10-pathtmp="$PATH" 13-pathtmp="$PATH"
11-PATH="..:$HOME/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin" 14-PATH="..:$HOME/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin"
12-PATH="$PATH:/usr/ccs/bin:/usr/ucb:/usr/xpg4/bin:/usr/xpg6/bin:$pathtmp" 15-PATH="$PATH:/usr/ccs/bin:/usr/ucb:/usr/xpg4/bin:/usr/xpg6/bin:$pathtmp"
13-LIBRARY_PATH="..:$HOME/lib:/usr/local/lib:$LIBRARY_PATH" 16-LIBRARY_PATH="..:$HOME/lib:/usr/local/lib:$LIBRARY_PATH"
14-LD_LIBRARY_PATH="..:$HOME/lib:/usr/local/lib:$LD_LIBRARY_PATH" 17-LD_LIBRARY_PATH="..:$HOME/lib:/usr/local/lib:$LD_LIBRARY_PATH"
15-CPATH="..:$HOME/include:/usr/local/include:$CPATH" 18-CPATH="..:$HOME/include:/usr/local/include:$CPATH"
16-PKG_CONFIG_PATH="..:$HOME/lib/pkgconfig:/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH" 19-PKG_CONFIG_PATH="..:$HOME/lib/pkgconfig:/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH"
17-export PATH LIBRARY_PATH LD_LIBRARY_PATH CPATH PKG_CONFIG_PATH 20-export PATH LIBRARY_PATH LD_LIBRARY_PATH CPATH PKG_CONFIG_PATH
18-if type pkg-config > /dev/null 2>&1 21-if type pkg-config > /dev/null 2>&1
@@ -20,22 +23,28 @@ $NetBSD: patch-ad,v 1.4 2008/06/19 15:18 @@ -20,22 +23,28 @@ $NetBSD: patch-ad,v 1.4 2008/06/19 15:18
20- PATH="$PATH:`pkg-config --variable=bindir qdbm`" 23- PATH="$PATH:`pkg-config --variable=bindir qdbm`"
21- PATH="$PATH:`pkg-config --variable=bindir hyperestraier`" 24- PATH="$PATH:`pkg-config --variable=bindir hyperestraier`"
22- LIBRARY_PATH="$LIBRARY_PATH:`pkg-config --variable=libdir qdbm`" 25- LIBRARY_PATH="$LIBRARY_PATH:`pkg-config --variable=libdir qdbm`"
23- LIBRARY_PATH="$LIBRARY_PATH:`pkg-config --variable=libdir hyperestraier`" 26- LIBRARY_PATH="$LIBRARY_PATH:`pkg-config --variable=libdir hyperestraier`"
24- LD_LIBRARY_PATH="$LD_LIBRARY_PATH:`pkg-config --variable=libdir qdbm`" 27- LD_LIBRARY_PATH="$LD_LIBRARY_PATH:`pkg-config --variable=libdir qdbm`"
25- LD_LIBRARY_PATH="$LD_LIBRARY_PATH:`pkg-config --variable=libdir hyperestraier`" 28- LD_LIBRARY_PATH="$LD_LIBRARY_PATH:`pkg-config --variable=libdir hyperestraier`"
26- CPATH="$CPATH:`pkg-config --variable=includedir qdbm`" 29- CPATH="$CPATH:`pkg-config --variable=includedir qdbm`"
27- CPATH="$CPATH:`pkg-config --variable=includedir hyperestraier`" 30- CPATH="$CPATH:`pkg-config --variable=includedir hyperestraier`"
28- export PATH LIBRARY_PATH LD_LIBRARY_PATH CPATH PKG_CONFIG_PATH 31- export PATH LIBRARY_PATH LD_LIBRARY_PATH CPATH PKG_CONFIG_PATH
29-fi 32-fi
30  33
31 # Setting the default prefix 34 # Setting the default prefix
32 if test "$prefix" = NONE 35 if test "$prefix" = NONE
 36 then
 37- prefix=`ruby -rrbconfig -e 'puts(Config::CONFIG.fetch("prefix"))'`
 38+ prefix=`ruby -rrbconfig -e 'puts(RbConfig::CONFIG.fetch("prefix"))'`
 39 fi
 40
 41
33@@ -1285,7 +1264,7 @@ fi 42@@ -1285,7 +1264,7 @@ fi
34 printf '%s\n' "$RDOC" 43 printf '%s\n' "$RDOC"
35  44
36 # Librarh path 45 # Librarh path
37-myrblibdir=`ruby -rrbconfig -e 'puts(Config::CONFIG.fetch("sitelibdir"))'` 46-myrblibdir=`ruby -rrbconfig -e 'puts(Config::CONFIG.fetch("sitelibdir"))'`
38+myrblibdir=`ruby -rrbconfig -e 'puts(Config::CONFIG.fetch("vendorarchdir"))'` 47+myrblibdir=`ruby -rrbconfig -e 'puts(RbConfig::CONFIG.fetch("vendorarchdir"))'`
39 if test -n "$myrblibdir" 48 if test -n "$myrblibdir"
40 then 49 then
41 MYRBLIBDIR="$myrblibdir" 50 MYRBLIBDIR="$myrblibdir"
cvs diff -r1.2 -r1.3 pkgsrc/textproc/hyperestraier/patches/patch-ae (expand / switch to unified diff)

--- pkgsrc/textproc/hyperestraier/patches/patch-ae 2008/06/19 15:18:31 1.2
+++ pkgsrc/textproc/hyperestraier/patches/patch-ae 2015/06/11 15:14:14 1.3
@@ -1,18 +1,21 @@ @@ -1,18 +1,21 @@
1$NetBSD: patch-ae,v 1.2 2008/06/19 15:18:31 taca Exp $ 1$NetBSD: patch-ae,v 1.3 2015/06/11 15:14:14 taca Exp $
 2
 3* Do not guess paths.
 4* Fix build problem on Ruby 2.2 and later.
2 5
3--- rubypure/configure.orig 2007-12-25 01:53:42.000000000 +0000 6--- rubypure/configure.orig 2007-12-25 01:53:42.000000000 +0000
4+++ rubypure/configure 7+++ rubypure/configure
5@@ -1232,27 +1232,6 @@ RUBY="ruby" 8@@ -1232,32 +1232,11 @@ RUBY="ruby"
6 RDOC="rdoc" 9 RDOC="rdoc"
7 MYRBLIBDIR=/usr/local/lib/ruby/site_ruby 10 MYRBLIBDIR=/usr/local/lib/ruby/site_ruby
8  11
9-# Building paths 12-# Building paths
10-pathtmp="$PATH" 13-pathtmp="$PATH"
11-PATH="..:$HOME/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin" 14-PATH="..:$HOME/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin"
12-PATH="$PATH:/usr/ccs/bin:/usr/ucb:/usr/xpg4/bin:/usr/xpg6/bin:$pathtmp" 15-PATH="$PATH:/usr/ccs/bin:/usr/ucb:/usr/xpg4/bin:/usr/xpg6/bin:$pathtmp"
13-LIBRARY_PATH="..:$HOME/lib:/usr/local/lib:$LIBRARY_PATH" 16-LIBRARY_PATH="..:$HOME/lib:/usr/local/lib:$LIBRARY_PATH"
14-LD_LIBRARY_PATH="..:$HOME/lib:/usr/local/lib:$LD_LIBRARY_PATH" 17-LD_LIBRARY_PATH="..:$HOME/lib:/usr/local/lib:$LD_LIBRARY_PATH"
15-CPATH="..:$HOME/include:/usr/local/include:$CPATH" 18-CPATH="..:$HOME/include:/usr/local/include:$CPATH"
16-PKG_CONFIG_PATH="..:$HOME/lib/pkgconfig:/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH" 19-PKG_CONFIG_PATH="..:$HOME/lib/pkgconfig:/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH"
17-export PATH LIBRARY_PATH LD_LIBRARY_PATH CPATH PKG_CONFIG_PATH 20-export PATH LIBRARY_PATH LD_LIBRARY_PATH CPATH PKG_CONFIG_PATH
18-if type pkg-config > /dev/null 2>&1 21-if type pkg-config > /dev/null 2>&1
@@ -20,22 +23,28 @@ $NetBSD: patch-ae,v 1.2 2008/06/19 15:18 @@ -20,22 +23,28 @@ $NetBSD: patch-ae,v 1.2 2008/06/19 15:18
20- PATH="$PATH:`pkg-config --variable=bindir qdbm`" 23- PATH="$PATH:`pkg-config --variable=bindir qdbm`"
21- PATH="$PATH:`pkg-config --variable=bindir hyperestraier`" 24- PATH="$PATH:`pkg-config --variable=bindir hyperestraier`"
22- LIBRARY_PATH="$LIBRARY_PATH:`pkg-config --variable=libdir qdbm`" 25- LIBRARY_PATH="$LIBRARY_PATH:`pkg-config --variable=libdir qdbm`"
23- LIBRARY_PATH="$LIBRARY_PATH:`pkg-config --variable=libdir hyperestraier`" 26- LIBRARY_PATH="$LIBRARY_PATH:`pkg-config --variable=libdir hyperestraier`"
24- LD_LIBRARY_PATH="$LD_LIBRARY_PATH:`pkg-config --variable=libdir qdbm`" 27- LD_LIBRARY_PATH="$LD_LIBRARY_PATH:`pkg-config --variable=libdir qdbm`"
25- LD_LIBRARY_PATH="$LD_LIBRARY_PATH:`pkg-config --variable=libdir hyperestraier`" 28- LD_LIBRARY_PATH="$LD_LIBRARY_PATH:`pkg-config --variable=libdir hyperestraier`"
26- CPATH="$CPATH:`pkg-config --variable=includedir qdbm`" 29- CPATH="$CPATH:`pkg-config --variable=includedir qdbm`"
27- CPATH="$CPATH:`pkg-config --variable=includedir hyperestraier`" 30- CPATH="$CPATH:`pkg-config --variable=includedir hyperestraier`"
28- export PATH LIBRARY_PATH LD_LIBRARY_PATH CPATH PKG_CONFIG_PATH 31- export PATH LIBRARY_PATH LD_LIBRARY_PATH CPATH PKG_CONFIG_PATH
29-fi 32-fi
30  33
31 # Setting the default prefix 34 # Setting the default prefix
32 if test "$prefix" = NONE 35 if test "$prefix" = NONE
 36 then
 37- prefix=`ruby -rrbconfig -e 'puts(Config::CONFIG.fetch("prefix"))'`
 38+ prefix=`ruby -rrbconfig -e 'puts(RbConfig::CONFIG.fetch("prefix"))'`
 39 fi
 40
 41
33@@ -1284,7 +1263,7 @@ fi 42@@ -1284,7 +1263,7 @@ fi
34 printf '%s\n' "$RDOC" 43 printf '%s\n' "$RDOC"
35  44
36 # Librarh path 45 # Librarh path
37-myrblibdir=`ruby -rrbconfig -e 'puts(Config::CONFIG.fetch("sitelibdir"))'` 46-myrblibdir=`ruby -rrbconfig -e 'puts(Config::CONFIG.fetch("sitelibdir"))'`
38+myrblibdir=`ruby -rrbconfig -e 'puts(Config::CONFIG.fetch("vendorlibdir"))'` 47+myrblibdir=`ruby -rrbconfig -e 'puts(RbConfig::CONFIG.fetch("vendorlibdir"))'`
39 if test -n "$myrblibdir" 48 if test -n "$myrblibdir"
40 then 49 then
41 MYRBLIBDIR="$myrblibdir" 50 MYRBLIBDIR="$myrblibdir"