Patch readline detection to try running the test program so that we catch

problems early on if insufficient libraries are specified during linking.
Move the configure script patch to the last patch of the group so that
the configure script will have the most recent timestamp.

3 files changed, 182 insertions, 137 deletions

diff --git a/databases/postgresql/distinfo b/databases/postgresql/distinfo
index 4f211796ba8..2438117c321 100644
--- a/databases/postgresql/distinfo
+++ b/databases/postgresql/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.4 2001/05/29 23:28:05 jlam Exp $
+$NetBSD: distinfo,v 1.5 2001/07/27 17:52:33 jlam Exp $
 
 SHA1 (postgresql-7.1.2.tar.gz) = d428b911b97fce1aea43f7322cc8c081322d258c
 Size (postgresql-7.1.2.tar.gz) = 8117016 bytes
 SHA1 (patch-aa) = e3b4c556c2a389ae5a27d4ecfe3809652faf4c8f
-SHA1 (patch-ab) = 13a0fa7296700deeb922bdd488ef8d7342a9f70f
+SHA1 (patch-ab) = 5e83cfb8825b700782405504d56ec87016caf0ff
 SHA1 (patch-ac) = feb9ea73626e131ed9bdb926a36ba312de1d6890
 SHA1 (patch-ad) = 0c55c66003603c688d727ca7de8fb73fdfdc88ac
 SHA1 (patch-ae) = ea4f680544bbdae36945b6393f50a0c15df38046
@@ -13,3 +13,4 @@ SHA1 (patch-ah) = bd89be830747ede444516f1abf44a0407164fe8d
 SHA1 (patch-ai) = 02b84f52941e7cb939388137392df18d53eecfb2
 SHA1 (patch-aj) = ca947f3686958c55d61c8110e99283038279d308
 SHA1 (patch-ak) = a3a50e64b70a0829c0374b803e4a5c6a6ed9c83e
+SHA1 (patch-al) = d1da4a0bd321b5dd683dadaaf0edc452c2292d0b
diff --git a/databases/postgresql/patches/patch-ab b/databases/postgresql/patches/patch-ab
index b7d0a4a046b..3d8a389c9bd 100644
--- a/databases/postgresql/patches/patch-ab
+++ b/databases/postgresql/patches/patch-ab
@@ -1,136 +1,13 @@
-$NetBSD: patch-ab,v 1.11 2001/05/14 14:52:38 jlam Exp $
+$NetBSD: patch-ab,v 1.12 2001/07/27 17:52:33 jlam Exp $
 
---- configure.orig	Sat May  5 16:05:37 2001
-+++ configure
-@@ -19,6 +19,8 @@
- ac_help="$ac_help
-   --with-libs=DIRS        alternative spelling of --with-libraries"
- ac_help="$ac_help
-+  --disable-readline      disable readline support"
-+ac_help="$ac_help
-   --enable-locale         enable locale support"
- ac_help="$ac_help
-   --enable-recode         enable character set recode support"
-@@ -53,6 +55,8 @@
- ac_help="$ac_help
-   --with-python           build Python interface module"
- ac_help="$ac_help
-+  --with-python-compile   byte-compile modules if Python is enabled"
-+ac_help="$ac_help
-   --with-java             build JDBC interface and Java tools"
- ac_help="$ac_help
-   --with-krb4[=DIR]       build with Kerberos 4 support [/usr/athena]"
-@@ -811,10 +815,36 @@
- 
- 
- #
-+# Readline support
-+#
-+echo $ac_n "checking whether to build with readline support""... $ac_c" 1>&6
-+echo "configure:822: checking whether to build with readline support" >&5
-+# Check whether --enable-readline was given
-+if test x"${enable_readline+set}" = xset; then
-+  case $enable_readline in
-+    yes)
-+      :
-+      ;;
-+    no)
-+      :
-+      ;;
-+    *)
-+      enableval=$enable_readline
-+      { echo "configure: error: no argument expected for --enable-readline option" 1>&2; exit 1; }
-+      ;;
-+  esac # $enable_readline
-+else
-+  enable_readline=yes
-+
-+fi
-+echo "$ac_t""$enable_readline" 1>&6
-+
-+
-+#
- # Locale (--enable-locale)
- #
- echo $ac_n "checking whether to build with locale support""... $ac_c" 1>&6
--echo "configure:818: checking whether to build with locale support" >&5
-+echo "configure:848: checking whether to build with locale support" >&5
- # Check whether --enable-locale was given
- if test x"${enable_locale+set}" = xset; then
-   case $enable_locale in
-@@ -1905,11 +1935,40 @@
- fi
- 
- 
-+# If python is enabled (above), then optionally byte-compile the modules.
-+echo $ac_n "checking whether to byte-compile Python modules""... $ac_c" 1>&6
-+echo "configure:1941: checking whether to byte-compile Python modules" >&5
-+if test "$with_python" = yes; then
-+  # Check whether --with-python_compile was given
-+if test x"${with_python_compile+set}" = xset; then
-+  case $with_python_compile in
-+    yes)
-+      :
-+      ;;
-+    no)
-+      :
-+      ;;
-+    *)
-+      withval=$with_python_compile
-+      { echo "configure: error: no argument expected for --with-python_compile option" 1>&2; exit 1; }
-+      ;;
-+  esac # $with_python_compile
-+else
-+  with_python_compile=no
-+
-+fi
-+else
-+  with_python_compile=no
-+fi
-+echo "$ac_t""$with_python_compile" 1>&6
-+
-+
-+
- #
- # Optionally build the Java/JDBC tools
- #
- echo $ac_n "checking whether to build Java/JDBC tools""... $ac_c" 1>&6
--echo "configure:1913: checking whether to build Java/JDBC tools" >&5
-+echo "configure:1972: checking whether to build Java/JDBC tools" >&5
- # Check whether --with-java was given
- if test x"${with_java+set}" = xset; then
-   case $with_java in
-@@ -3095,8 +3154,9 @@
- ## Libraries
- ##
- 
--echo $ac_n "checking for readline""... $ac_c" 1>&6
--echo "configure:3100: checking for readline" >&5
-+if test "$enable_readline" = yes; then
-+echo $ac_n "checking for readline""... $ac_c" 1>&6
-+echo "configure:3160: checking for readline" >&5
- 
- if eval "test \"`echo '$''{'pgac_cv_check_readline'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -3208,11 +3268,12 @@
- else :
-   
- fi
-+fi
- 
- if test "$PORTNAME" != "aix" -a "$PORTNAME" != "alpha"
- then
- 	echo $ac_n "checking for main in -lbsd""... $ac_c" 1>&6
--echo "configure:3216: checking for main in -lbsd" >&5
-+echo "configure:3277: checking for main in -lbsd" >&5
- ac_lib_var=`echo bsd'_'main | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -8103,6 +8164,7 @@
- s%@python_moduledir@%$python_moduledir%g
- s%@python_extmakefile@%$python_extmakefile%g
- s%@with_python@%$with_python%g
-+s%@with_python_compile@%$with_python_compile%g
- s%@ANT@%$ANT%g
- s%@with_java@%$with_java%g
- s%@with_krb4@%$with_krb4%g
+--- config/programs.m4.orig	Sat Feb 10 14:31:42 2001
++++ config/programs.m4
+@@ -85,7 +85,7 @@
+   for pgac_rllib in -lreadline -ledit ; do
+     pgac_save_LIBS=$LIBS
+     LIBS="${pgac_rllib}${pgac_lib} $LIBS"
+-    AC_TRY_LINK_FUNC([readline], [pgac_cv_check_readline="${pgac_rllib}${pgac_lib}"; break 2])
++    AC_TRY_LINK_FUNC([readline], AC_TRY_RUN([int main() { return 0; }], [pgac_cv_check_readline="${pgac_rllib}${pgac_lib}"; break 2]))
+     LIBS=$pgac_save_LIBS
+   done
+ done
diff --git a/databases/postgresql/patches/patch-al b/databases/postgresql/patches/patch-al
new file mode 100644
index 00000000000..74896304f8f
--- /dev/null
+++ b/databases/postgresql/patches/patch-al
@@ -0,0 +1,167 @@
+$NetBSD: patch-al,v 1.5 2001/07/27 17:52:33 jlam Exp $
+
+--- configure.orig	Thu May 10 18:35:47 2001
++++ configure
+@@ -19,6 +19,8 @@
+ ac_help="$ac_help
+   --with-libs=DIRS        alternative spelling of --with-libraries"
+ ac_help="$ac_help
++  --disable-readline      disable readline support"
++ac_help="$ac_help
+   --enable-locale         enable locale support"
+ ac_help="$ac_help
+   --enable-recode         enable character set recode support"
+@@ -53,6 +55,8 @@
+ ac_help="$ac_help
+   --with-python           build Python interface module"
+ ac_help="$ac_help
++  --with-python-compile   byte-compile modules if Python is enabled"
++ac_help="$ac_help
+   --with-java             build JDBC interface and Java tools"
+ ac_help="$ac_help
+   --with-krb4[=DIR]       build with Kerberos 4 support [/usr/athena]"
+@@ -811,10 +815,36 @@
+ 
+ 
+ #
++# Readline support
++#
++echo $ac_n "checking whether to build with readline support""... $ac_c" 1>&6
++echo "configure:822: checking whether to build with readline support" >&5
++# Check whether --enable-readline was given
++if test x"${enable_readline+set}" = xset; then
++  case $enable_readline in
++    yes)
++      :
++      ;;
++    no)
++      :
++      ;;
++    *)
++      enableval=$enable_readline
++      { echo "configure: error: no argument expected for --enable-readline option" 1>&2; exit 1; }
++      ;;
++  esac # $enable_readline
++else
++  enable_readline=yes
++
++fi
++echo "$ac_t""$enable_readline" 1>&6
++
++
++#
+ # Locale (--enable-locale)
+ #
+ echo $ac_n "checking whether to build with locale support""... $ac_c" 1>&6
+-echo "configure:818: checking whether to build with locale support" >&5
++echo "configure:848: checking whether to build with locale support" >&5
+ # Check whether --enable-locale was given
+ if test x"${enable_locale+set}" = xset; then
+   case $enable_locale in
+@@ -1905,11 +1935,40 @@
+ fi
+ 
+ 
++# If python is enabled (above), then optionally byte-compile the modules.
++echo $ac_n "checking whether to byte-compile Python modules""... $ac_c" 1>&6
++echo "configure:1941: checking whether to byte-compile Python modules" >&5
++if test "$with_python" = yes; then
++  # Check whether --with-python_compile was given
++if test x"${with_python_compile+set}" = xset; then
++  case $with_python_compile in
++    yes)
++      :
++      ;;
++    no)
++      :
++      ;;
++    *)
++      withval=$with_python_compile
++      { echo "configure: error: no argument expected for --with-python_compile option" 1>&2; exit 1; }
++      ;;
++  esac # $with_python_compile
++else
++  with_python_compile=no
++
++fi
++else
++  with_python_compile=no
++fi
++echo "$ac_t""$with_python_compile" 1>&6
++
++
++
+ #
+ # Optionally build the Java/JDBC tools
+ #
+ echo $ac_n "checking whether to build Java/JDBC tools""... $ac_c" 1>&6
+-echo "configure:1913: checking whether to build Java/JDBC tools" >&5
++echo "configure:1972: checking whether to build Java/JDBC tools" >&5
+ # Check whether --with-java was given
+ if test x"${with_java+set}" = xset; then
+   case $with_java in
+@@ -3095,8 +3154,9 @@
+ ## Libraries
+ ##
+ 
++if test "$enable_readline" = yes; then
+ echo $ac_n "checking for readline""... $ac_c" 1>&6
+-echo "configure:3100: checking for readline" >&5
++echo "configure:3160: checking for readline" >&5
+ 
+ if eval "test \"`echo '$''{'pgac_cv_check_readline'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -3118,13 +3178,30 @@
+ readline()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3122: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3182: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
++  if test "$cross_compiling" = yes; then
++    { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
++else
++  cat > conftest.$ac_ext <<EOF
++#line 3188 "configure"
++#include "confdefs.h"
++int main() { return 0; }
++EOF
++if { (eval echo configure:3192: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++then
+   pgac_cv_check_readline="${pgac_rllib}${pgac_lib}"; break 2
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+ fi
++rm -fr conftest*
++fi
++
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++fi
+ rm -f conftest*
+     LIBS=$pgac_save_LIBS
+   done
+@@ -3208,11 +3285,12 @@
+ else :
+   
+ fi
++fi
+ 
+ if test "$PORTNAME" != "aix" -a "$PORTNAME" != "alpha"
+ then
+ 	echo $ac_n "checking for main in -lbsd""... $ac_c" 1>&6
+-echo "configure:3216: checking for main in -lbsd" >&5
++echo "configure:3294: checking for main in -lbsd" >&5
+ ac_lib_var=`echo bsd'_'main | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -8103,6 +8181,7 @@
+ s%@python_moduledir@%$python_moduledir%g
+ s%@python_extmakefile@%$python_extmakefile%g
+ s%@with_python@%$with_python%g
++s%@with_python_compile@%$with_python_compile%g
+ s%@ANT@%$ANT%g
+ s%@with_java@%$with_java%g
+ s%@with_krb4@%$with_krb4%g