1 files changed, 20 insertions, 30 deletions
diff --git a/databases/sqlrelay/patches/patch-configure b/databases/sqlrelay/patches/patch-configure
index 1a0e12f4c03..448fce341dd 100644
--- a/databases/sqlrelay/patches/patch-configure
+++ b/databases/sqlrelay/patches/patch-configure
@@ -1,36 +1,26 @@
-$NetBSD: patch-configure,v 1.4 2015/09/02 12:39:33 fhajny Exp $
+$NetBSD: patch-configure,v 1.5 2016/10/21 14:16:34 fhajny Exp $
 
-Look for history/readline at proper places.
---- configure.orig	2015-08-16 02:25:15.000000000 +0000
+Fix Python 3 lookup.
+Fix Ruby support.
+
+--- configure.orig	2016-07-26 07:55:32.000000000 +0000
 +++ configure
-@@ -17662,7 +17662,7 @@ fi
- $as_echo_n "checking for history... " >&6; }
- 
- 
--SEARCHPATH=/usr
-+SEARCHPATH=${prefix}
- NAME=history
- HEADER=readline/history.h
- LIBNAME=history
-@@ -17998,7 +17998,7 @@ fi
- $as_echo_n "checking for readline... " >&6; }
- 
- 
--SEARCHPATH=/usr
-+SEARCHPATH=${prefix}
- NAME=readline
- HEADER=readline/readline.h
- LIBNAME=readline
-@@ -18606,7 +18606,7 @@ rm -f core conftest.err conftest.$ac_obj
- 
- 
+@@ -32419,12 +32419,12 @@ then
  
--SEARCHPATH=/usr
-+SEARCHPATH=${prefix}
- NAME=iconv
- HEADER=iconv.h
- LIBNAME=iconv
-@@ -33144,7 +33144,7 @@ print CONFIG["arch"]
+ 			for i in "3.9" "3.8" "3.7" "3.6" "3.5" "3.4" "3.3" "3.2" "3.1" "3.0"
+ 			do
+-				if ( test -d "$PYTHON3PATH/include/python$i" -a -d "$PYTHON3PATH/lib64/python$i/config" )
++				if ( test -d "$PYTHON3PATH/include/python$i" -a -d "$PYTHON3PATH/lib64/python$i/config-$i" )
+ 				then
+ 					PYTHON3INCLUDES="-I$PYTHON3PATH/include/python$i"
+ 					PYTHON3DIR="$PYTHON3PATH/lib64/python$i"
+ 				else
+-					if ( test -d "$PYTHON3PATH/include/python$i" -a -d "$PYTHON3PATH/lib/python$i/config" )
++					if ( test -d "$PYTHON3PATH/include/python$i" -a -d "$PYTHON3PATH/lib/python$i/config-$i" )
+ 					then
+ 						PYTHON3INCLUDES="-I$PYTHON3PATH/include/python$i"
+ 						PYTHON3DIR="$PYTHON3PATH/lib/python$i"
+@@ -32914,7 +32914,7 @@ print CONFIG["arch"]
  print "\n"
  print "ruby_version = "
  begin