databases/sqlrelay: improve ruby-sqlrelay

Improve ruby-sqlrelay configuration; do not try to detect installed ruby
but use simply RUBY environment variable.

2 files changed, 225 insertions, 11 deletions

diff --git a/databases/sqlrelay/distinfo b/databases/sqlrelay/distinfo
index d929f01d14d..b0b07a73a57 100644
--- a/databases/sqlrelay/distinfo
+++ b/databases/sqlrelay/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.26 2021/02/16 13:12:39 adam Exp $
+$NetBSD: distinfo,v 1.27 2021/03/01 14:39:01 taca Exp $
 
 SHA1 (sqlrelay-1.8.0.tar.gz) = 30fe6bab49b04c091cee61d77c854d8b4674cc1d
 RMD160 (sqlrelay-1.8.0.tar.gz) = 1c87f0da0d8334a23fff35e9ff1edeb3f2093111
@@ -6,7 +6,7 @@ SHA512 (sqlrelay-1.8.0.tar.gz) = cfb430f1eb9de4c8dd5c4ee4a89a1c04ba2449cc302155b
 Size (sqlrelay-1.8.0.tar.gz) = 4684135 bytes
 SHA1 (patch-Makefile) = 4005ca28daec0180fe298f711b22b3d8dcf02a9a
 SHA1 (patch-config.mk.in) = 172f04e655d31705b107f0889d86c48db9e0919a
-SHA1 (patch-configure) = a2355371cbf9d81f8d17568ed9ff0b6788dd25f9
+SHA1 (patch-configure) = c4c00878bb377ffaed4ec3268956e6be825b7324
 SHA1 (patch-etc_Makefile) = 5c768f50a97489ea06ca586b131ef0324878f8d0
 SHA1 (patch-src_api_nodejs_Makefile) = 6f0e569f25fd1e78e088b8e0cd8eb541c2c5d417
 SHA1 (patch-src_api_nodejs_package__in.json) = 76e2ebc4e47d5ef38d0c96059b62460fef687d1e
diff --git a/databases/sqlrelay/patches/patch-configure b/databases/sqlrelay/patches/patch-configure
index fc61b9da6e1..b60fbfe3aa7 100644
--- a/databases/sqlrelay/patches/patch-configure
+++ b/databases/sqlrelay/patches/patch-configure
@@ -1,4 +1,4 @@
-$NetBSD: patch-configure,v 1.8 2021/02/16 13:12:39 adam Exp $
+$NetBSD: patch-configure,v 1.9 2021/03/01 14:39:01 taca Exp $
 
 Cripple iODBC check, we're using UnixODBC and it was getting in the way.
 Fix Perl lookup.
@@ -38,12 +38,226 @@ Fix Ruby support.
  			do
  
  				if ( test -n "$pyprefix" )
-@@ -34483,7 +34483,7 @@ print CONFIG["arch"]
- print "\n"
- print "ruby_version = "
- begin
+@@ -34328,219 +34328,9 @@ echo "***** Ruby *******************"
+ 
+ if ( test "$ENABLE_RUBY" = "yes" )
+ then
+-
+-	HAVE_RUBY=""
+-	RUBY=""
+-	RUBYLIB=""
+-
+-	if ( test "$cross_compiling" = "yes" )
+-	then
+-
+-				echo "cross compiling..."
+-
+-	else
+-
+-		found="no"
+-
+-		for major in "" "1" "2"
+-		do
+-
+-			for minor in "" "9" "8" "7" "6" "5" "4" "3" "2" "1" "0"
+-			do
+-
+-				for patchlevel in "" "0" "1" "2" "3" "4" "5" "6" "7" "8" "9"
+-				do
+-
+-					for separator in "" "."
+-					do
+-
+-			ruby="ruby$major$separator$minor"
+-			if ( test -n "$patchlevel" )
+-			then
+-				ruby="ruby$major$separator$minor$separator$patchlevel"
+-			fi
+-
+-			HAVE_RUBY=""
+-			RUBY=""
+-			RUBYLIB=""
+-
+-			if ( test -n "$RUBYPATH" )
+-			then
+-
+-if ( test -r ""$RUBYPATH/bin/$ruby"" )
+-then
+-	eval "RUBY=\"$RUBYPATH/bin/$ruby\""
+-fi
+-
+-			else
+-				# Extract the first word of ""$ruby"", so it can be a program name with args.
+-set dummy "$ruby"; ac_word=$2
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_prog_RUBY+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  if test -n "$RUBY"; then
+-  ac_cv_prog_RUBY="$RUBY" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-    for ac_exec_ext in '' $ac_executable_extensions; do
+-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_prog_RUBY=""$ruby""
+-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-  done
+-IFS=$as_save_IFS
+-
+-fi
+-fi
+-RUBY=$ac_cv_prog_RUBY
+-if test -n "$RUBY"; then
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RUBY" >&5
+-$as_echo "$RUBY" >&6; }
+-else
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
+-
+-
+-				if ( test -z "$RUBY" )
+-				then
+-					for i in "/usr/local/ruby/bin" "/usr/bin" "/usr/local/bin" "/usr/pkg/bin" "/opt/sfw/bin" "/usr/sfw/bin" "/opt/csw/bin" "/sw/bin" "/boot/common/bin" "/resources/index/bin"
+-					do
+-
+-if ( test -r ""$i/$ruby"" )
+-then
+-	eval "RUBY=\"$i/$ruby\""
+-fi
+-
+-						if ( test -n "$RUBY" )
+-						then
+-							found="yes"
+-							break
+-						fi
+-					done
+-				fi
+-			fi
+-
+-			if ( test -n "$RUBY" )
+-			then
+-				HAVE_RUBY="yes"
+-								if ( test -n "$CYGWIN" -o -n "$DARWIN" )
+-				then
+-					RUBYLIB="-lruby"
+-				fi
+-				found="yes"
+-				break
+-			fi
+-						if ( test -z "$major" -o -z "$minor" -o -z "$patchlevel" )
+-						then
+-							break
+-						fi
+-
+-					done
+-					if ( test "$found" = "yes" )
+-					then
+-						break
+-					fi
+-					if ( test -z "$minor" )
+-					then
+-						break
+-					fi
+-				done
+-				if ( test "$found" = "yes" )
+-				then
+-						break
+-				fi
+-				if ( test -z "$major" )
+-				then
+-					break
+-				fi
+-			done
+-			if ( test "$found" = "yes" )
+-			then
+-				break
+-			fi
+-		done
+-
+-		if ( test -n "$HAVE_RUBY" )
+-		then
+-			{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ruby.h" >&5
+-$as_echo_n "checking for ruby.h... " >&6; }
+-			rm -f conftest.rb
+-			cat > conftest.rb << END
+-require "mkmf"
+-drive = File::PATH_SEPARATOR == ";" ? /\A\w:/ : /\A/
+-print "\n"
+-print "arch = "
+-print CONFIG["arch"]
+-print "\n"
+-print "ruby_version = "
+-begin
 -print Config::CONFIG["ruby_version"]
-+print RbConfig::CONFIG["ruby_version"]
- rescue
- print CONFIG["ruby_version"]
- end
+-rescue
+-print CONFIG["ruby_version"]
+-end
+-print "\n"
+-print "prefix = "
+-print CONFIG["prefix"].sub(drive, "")
+-print "\n"
+-print "exec_prefix = "
+-print CONFIG["exec_prefix"].sub(drive, "")
+-print "\n"
+-print "libdir = "
+-print \$libdir.sub(drive, "")
+-print "\n"
+-print "rubylibdir = "
+-print \$rubylibdir.sub(drive, "")
+-print "\n"
+-print "topdir = "
+-print \$topdir
+-print "\n"
+-print "hdrdir = "
+-print \$hdrdir
+-print "\n\n"
+-print "all:\n"
+-print "	echo \$(hdrdir)\n"
+-END
+-
+-			HAVE_RUBY_H=""
+-			for dir in `eval $RUBY conftest.rb 2>/dev/null | sed -e "s|-x.* | |g" -e "s|-belf||g" -e "s|-mtune=.* | |g" | $MAKE -s -f - | grep -v Entering | grep -v Leaving`
+-			do
+-				if ( test -r "$dir/ruby.h" )
+-				then
+-					HAVE_RUBY_H="yes"
+-				fi
+-			done
+-			rm -f conftest.rb
+-
+-						if ( test -z "$HAVE_RUBY_H" )
+-			then
+-				{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-				HAVE_RUBY=""
+-			else
+-				{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-$as_echo "yes" >&6; }
+-			fi
+-		fi
+-	fi
+-
+-	if ( test -z "$HAVE_RUBY" )
+-	then
+-		{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: The Ruby API will not be built." >&5
+-$as_echo "$as_me: WARNING: The Ruby API will not be built." >&2;}
+-	fi
+-
+-
+-
+-
++	HAVE_RUBY=yes
++	RUBY="${RUBY}"
++	RUBYLIB="-l$(${RUBY} -e 'require "mkmf"; puts RbConfig::CONFIG["RUBY_SO_NAME"]')"
+ fi
+ 
+ echo "******************************"