Fix build on -CURRENT:

* The compiler in -CURRENT now complains if you precede -I/usr/include
  with -I... .  The same applies to -I/usr/lib .

* The distribution's configure file treats the compiler's unexpected
  warning message as a failure and errors out.

Maintainer notified in private mail.

14 files changed, 826 insertions, 0 deletions

diff --git a/databases/postgresql-devel-server/files/patch-configure b/databases/postgresql-devel-server/files/patch-configure
new file mode 100644
index 000000000000..efeca517d300
--- /dev/null
+++ b/databases/postgresql-devel-server/files/patch-configure
@@ -0,0 +1,59 @@
+--- configure.orig	Wed Jun 26 21:28:24 2002
++++ configure	Wed Jun 26 21:35:16 2002
+@@ -2007,11 +2007,13 @@
+ EOF
+ 
+ 
+-  if test -d "$krb4_prefix/include"; then
+-    INCLUDES="$INCLUDES -I$krb4_prefix/include"
+-  fi
+-  if test -d "$krb4_prefix/lib"; then
+-    LIBDIRS="$LIBDIRS -L$krb4_prefix/lib"
++  if test "$krb4_prefix" != "/usr"; then
++    if test -d "$krb4_prefix/include"; then
++      INCLUDES="$INCLUDES -I$krb4_prefix/include"
++    fi
++    if test -d "$krb4_prefix/lib"; then
++      LIBDIRS="$LIBDIRS -L$krb4_prefix/lib"
++    fi
+   fi
+ 
+   krb_srvtab="/etc/srvtab"
+@@ -2052,11 +2054,13 @@
+ EOF
+ 
+ 
+-  if test -d "$krb5_prefix/include"; then
+-    INCLUDES="$INCLUDES -I$krb5_prefix/include"
+-  fi
+-  if test -d "$krb5_prefix/lib"; then
+-    LIBDIRS="$LIBDIRS -L$krb5_prefix/lib"
++  if test "$krb5_prefix" != "/usr"; then
++    if test -d "$krb5_prefix/include"; then
++      INCLUDES="$INCLUDES -I$krb5_prefix/include"
++    fi
++    if test -d "$krb5_prefix/lib"; then
++      LIBDIRS="$LIBDIRS -L$krb5_prefix/lib"
++    fi
+   fi
+ 
+   krb_srvtab="FILE:\$(sysconfdir)/krb5.keytab"
+@@ -2157,11 +2161,13 @@
+ EOF
+ 
+ 
+-  if test -d "${openssl_prefix}/include" ; then
+-    INCLUDES="$INCLUDES -I${openssl_prefix}/include"
+-  fi
+-  if test -d "${openssl_prefix}/lib" ; then
+-    LIBDIRS="$LIBDIRS -L${openssl_prefix}/lib"
++  if test "${openssl_prefix}" != "/usr"; then
++    if test -d "${openssl_prefix}/include" ; then
++      INCLUDES="$INCLUDES -I${openssl_prefix}/include"
++    fi
++    if test -d "${openssl_prefix}/lib" ; then
++      LIBDIRS="$LIBDIRS -L${openssl_prefix}/lib"
++    fi
+   fi
+ 
+ fi
diff --git a/databases/postgresql-devel/files/patch-configure b/databases/postgresql-devel/files/patch-configure
new file mode 100644
index 000000000000..efeca517d300
--- /dev/null
+++ b/databases/postgresql-devel/files/patch-configure
@@ -0,0 +1,59 @@
+--- configure.orig	Wed Jun 26 21:28:24 2002
++++ configure	Wed Jun 26 21:35:16 2002
+@@ -2007,11 +2007,13 @@
+ EOF
+ 
+ 
+-  if test -d "$krb4_prefix/include"; then
+-    INCLUDES="$INCLUDES -I$krb4_prefix/include"
+-  fi
+-  if test -d "$krb4_prefix/lib"; then
+-    LIBDIRS="$LIBDIRS -L$krb4_prefix/lib"
++  if test "$krb4_prefix" != "/usr"; then
++    if test -d "$krb4_prefix/include"; then
++      INCLUDES="$INCLUDES -I$krb4_prefix/include"
++    fi
++    if test -d "$krb4_prefix/lib"; then
++      LIBDIRS="$LIBDIRS -L$krb4_prefix/lib"
++    fi
+   fi
+ 
+   krb_srvtab="/etc/srvtab"
+@@ -2052,11 +2054,13 @@
+ EOF
+ 
+ 
+-  if test -d "$krb5_prefix/include"; then
+-    INCLUDES="$INCLUDES -I$krb5_prefix/include"
+-  fi
+-  if test -d "$krb5_prefix/lib"; then
+-    LIBDIRS="$LIBDIRS -L$krb5_prefix/lib"
++  if test "$krb5_prefix" != "/usr"; then
++    if test -d "$krb5_prefix/include"; then
++      INCLUDES="$INCLUDES -I$krb5_prefix/include"
++    fi
++    if test -d "$krb5_prefix/lib"; then
++      LIBDIRS="$LIBDIRS -L$krb5_prefix/lib"
++    fi
+   fi
+ 
+   krb_srvtab="FILE:\$(sysconfdir)/krb5.keytab"
+@@ -2157,11 +2161,13 @@
+ EOF
+ 
+ 
+-  if test -d "${openssl_prefix}/include" ; then
+-    INCLUDES="$INCLUDES -I${openssl_prefix}/include"
+-  fi
+-  if test -d "${openssl_prefix}/lib" ; then
+-    LIBDIRS="$LIBDIRS -L${openssl_prefix}/lib"
++  if test "${openssl_prefix}" != "/usr"; then
++    if test -d "${openssl_prefix}/include" ; then
++      INCLUDES="$INCLUDES -I${openssl_prefix}/include"
++    fi
++    if test -d "${openssl_prefix}/lib" ; then
++      LIBDIRS="$LIBDIRS -L${openssl_prefix}/lib"
++    fi
+   fi
+ 
+ fi
diff --git a/databases/postgresql7/files/patch-configure b/databases/postgresql7/files/patch-configure
new file mode 100644
index 000000000000..efeca517d300
--- /dev/null
+++ b/databases/postgresql7/files/patch-configure
@@ -0,0 +1,59 @@
+--- configure.orig	Wed Jun 26 21:28:24 2002
++++ configure	Wed Jun 26 21:35:16 2002
+@@ -2007,11 +2007,13 @@
+ EOF
+ 
+ 
+-  if test -d "$krb4_prefix/include"; then
+-    INCLUDES="$INCLUDES -I$krb4_prefix/include"
+-  fi
+-  if test -d "$krb4_prefix/lib"; then
+-    LIBDIRS="$LIBDIRS -L$krb4_prefix/lib"
++  if test "$krb4_prefix" != "/usr"; then
++    if test -d "$krb4_prefix/include"; then
++      INCLUDES="$INCLUDES -I$krb4_prefix/include"
++    fi
++    if test -d "$krb4_prefix/lib"; then
++      LIBDIRS="$LIBDIRS -L$krb4_prefix/lib"
++    fi
+   fi
+ 
+   krb_srvtab="/etc/srvtab"
+@@ -2052,11 +2054,13 @@
+ EOF
+ 
+ 
+-  if test -d "$krb5_prefix/include"; then
+-    INCLUDES="$INCLUDES -I$krb5_prefix/include"
+-  fi
+-  if test -d "$krb5_prefix/lib"; then
+-    LIBDIRS="$LIBDIRS -L$krb5_prefix/lib"
++  if test "$krb5_prefix" != "/usr"; then
++    if test -d "$krb5_prefix/include"; then
++      INCLUDES="$INCLUDES -I$krb5_prefix/include"
++    fi
++    if test -d "$krb5_prefix/lib"; then
++      LIBDIRS="$LIBDIRS -L$krb5_prefix/lib"
++    fi
+   fi
+ 
+   krb_srvtab="FILE:\$(sysconfdir)/krb5.keytab"
+@@ -2157,11 +2161,13 @@
+ EOF
+ 
+ 
+-  if test -d "${openssl_prefix}/include" ; then
+-    INCLUDES="$INCLUDES -I${openssl_prefix}/include"
+-  fi
+-  if test -d "${openssl_prefix}/lib" ; then
+-    LIBDIRS="$LIBDIRS -L${openssl_prefix}/lib"
++  if test "${openssl_prefix}" != "/usr"; then
++    if test -d "${openssl_prefix}/include" ; then
++      INCLUDES="$INCLUDES -I${openssl_prefix}/include"
++    fi
++    if test -d "${openssl_prefix}/lib" ; then
++      LIBDIRS="$LIBDIRS -L${openssl_prefix}/lib"
++    fi
+   fi
+ 
+ fi
diff --git a/databases/postgresql73-server/files/patch-configure b/databases/postgresql73-server/files/patch-configure
new file mode 100644
index 000000000000..efeca517d300
--- /dev/null
+++ b/databases/postgresql73-server/files/patch-configure
@@ -0,0 +1,59 @@
+--- configure.orig	Wed Jun 26 21:28:24 2002
++++ configure	Wed Jun 26 21:35:16 2002
+@@ -2007,11 +2007,13 @@
+ EOF
+ 
+ 
+-  if test -d "$krb4_prefix/include"; then
+-    INCLUDES="$INCLUDES -I$krb4_prefix/include"
+-  fi
+-  if test -d "$krb4_prefix/lib"; then
+-    LIBDIRS="$LIBDIRS -L$krb4_prefix/lib"
++  if test "$krb4_prefix" != "/usr"; then
++    if test -d "$krb4_prefix/include"; then
++      INCLUDES="$INCLUDES -I$krb4_prefix/include"
++    fi
++    if test -d "$krb4_prefix/lib"; then
++      LIBDIRS="$LIBDIRS -L$krb4_prefix/lib"
++    fi
+   fi
+ 
+   krb_srvtab="/etc/srvtab"
+@@ -2052,11 +2054,13 @@
+ EOF
+ 
+ 
+-  if test -d "$krb5_prefix/include"; then
+-    INCLUDES="$INCLUDES -I$krb5_prefix/include"
+-  fi
+-  if test -d "$krb5_prefix/lib"; then
+-    LIBDIRS="$LIBDIRS -L$krb5_prefix/lib"
++  if test "$krb5_prefix" != "/usr"; then
++    if test -d "$krb5_prefix/include"; then
++      INCLUDES="$INCLUDES -I$krb5_prefix/include"
++    fi
++    if test -d "$krb5_prefix/lib"; then
++      LIBDIRS="$LIBDIRS -L$krb5_prefix/lib"
++    fi
+   fi
+ 
+   krb_srvtab="FILE:\$(sysconfdir)/krb5.keytab"
+@@ -2157,11 +2161,13 @@
+ EOF
+ 
+ 
+-  if test -d "${openssl_prefix}/include" ; then
+-    INCLUDES="$INCLUDES -I${openssl_prefix}/include"
+-  fi
+-  if test -d "${openssl_prefix}/lib" ; then
+-    LIBDIRS="$LIBDIRS -L${openssl_prefix}/lib"
++  if test "${openssl_prefix}" != "/usr"; then
++    if test -d "${openssl_prefix}/include" ; then
++      INCLUDES="$INCLUDES -I${openssl_prefix}/include"
++    fi
++    if test -d "${openssl_prefix}/lib" ; then
++      LIBDIRS="$LIBDIRS -L${openssl_prefix}/lib"
++    fi
+   fi
+ 
+ fi
diff --git a/databases/postgresql73/files/patch-configure b/databases/postgresql73/files/patch-configure
new file mode 100644
index 000000000000..efeca517d300
--- /dev/null
+++ b/databases/postgresql73/files/patch-configure
@@ -0,0 +1,59 @@
+--- configure.orig	Wed Jun 26 21:28:24 2002
++++ configure	Wed Jun 26 21:35:16 2002
+@@ -2007,11 +2007,13 @@
+ EOF
+ 
+ 
+-  if test -d "$krb4_prefix/include"; then
+-    INCLUDES="$INCLUDES -I$krb4_prefix/include"
+-  fi
+-  if test -d "$krb4_prefix/lib"; then
+-    LIBDIRS="$LIBDIRS -L$krb4_prefix/lib"
++  if test "$krb4_prefix" != "/usr"; then
++    if test -d "$krb4_prefix/include"; then
++      INCLUDES="$INCLUDES -I$krb4_prefix/include"
++    fi
++    if test -d "$krb4_prefix/lib"; then
++      LIBDIRS="$LIBDIRS -L$krb4_prefix/lib"
++    fi
+   fi
+ 
+   krb_srvtab="/etc/srvtab"
+@@ -2052,11 +2054,13 @@
+ EOF
+ 
+ 
+-  if test -d "$krb5_prefix/include"; then
+-    INCLUDES="$INCLUDES -I$krb5_prefix/include"
+-  fi
+-  if test -d "$krb5_prefix/lib"; then
+-    LIBDIRS="$LIBDIRS -L$krb5_prefix/lib"
++  if test "$krb5_prefix" != "/usr"; then
++    if test -d "$krb5_prefix/include"; then
++      INCLUDES="$INCLUDES -I$krb5_prefix/include"
++    fi
++    if test -d "$krb5_prefix/lib"; then
++      LIBDIRS="$LIBDIRS -L$krb5_prefix/lib"
++    fi
+   fi
+ 
+   krb_srvtab="FILE:\$(sysconfdir)/krb5.keytab"
+@@ -2157,11 +2161,13 @@
+ EOF
+ 
+ 
+-  if test -d "${openssl_prefix}/include" ; then
+-    INCLUDES="$INCLUDES -I${openssl_prefix}/include"
+-  fi
+-  if test -d "${openssl_prefix}/lib" ; then
+-    LIBDIRS="$LIBDIRS -L${openssl_prefix}/lib"
++  if test "${openssl_prefix}" != "/usr"; then
++    if test -d "${openssl_prefix}/include" ; then
++      INCLUDES="$INCLUDES -I${openssl_prefix}/include"
++    fi
++    if test -d "${openssl_prefix}/lib" ; then
++      LIBDIRS="$LIBDIRS -L${openssl_prefix}/lib"
++    fi
+   fi
+ 
+ fi
diff --git a/databases/postgresql74-server/files/patch-configure b/databases/postgresql74-server/files/patch-configure
new file mode 100644
index 000000000000..efeca517d300
--- /dev/null
+++ b/databases/postgresql74-server/files/patch-configure
@@ -0,0 +1,59 @@
+--- configure.orig	Wed Jun 26 21:28:24 2002
++++ configure	Wed Jun 26 21:35:16 2002
+@@ -2007,11 +2007,13 @@
+ EOF
+ 
+ 
+-  if test -d "$krb4_prefix/include"; then
+-    INCLUDES="$INCLUDES -I$krb4_prefix/include"
+-  fi
+-  if test -d "$krb4_prefix/lib"; then
+-    LIBDIRS="$LIBDIRS -L$krb4_prefix/lib"
++  if test "$krb4_prefix" != "/usr"; then
++    if test -d "$krb4_prefix/include"; then
++      INCLUDES="$INCLUDES -I$krb4_prefix/include"
++    fi
++    if test -d "$krb4_prefix/lib"; then
++      LIBDIRS="$LIBDIRS -L$krb4_prefix/lib"
++    fi
+   fi
+ 
+   krb_srvtab="/etc/srvtab"
+@@ -2052,11 +2054,13 @@
+ EOF
+ 
+ 
+-  if test -d "$krb5_prefix/include"; then
+-    INCLUDES="$INCLUDES -I$krb5_prefix/include"
+-  fi
+-  if test -d "$krb5_prefix/lib"; then
+-    LIBDIRS="$LIBDIRS -L$krb5_prefix/lib"
++  if test "$krb5_prefix" != "/usr"; then
++    if test -d "$krb5_prefix/include"; then
++      INCLUDES="$INCLUDES -I$krb5_prefix/include"
++    fi
++    if test -d "$krb5_prefix/lib"; then
++      LIBDIRS="$LIBDIRS -L$krb5_prefix/lib"
++    fi
+   fi
+ 
+   krb_srvtab="FILE:\$(sysconfdir)/krb5.keytab"
+@@ -2157,11 +2161,13 @@
+ EOF
+ 
+ 
+-  if test -d "${openssl_prefix}/include" ; then
+-    INCLUDES="$INCLUDES -I${openssl_prefix}/include"
+-  fi
+-  if test -d "${openssl_prefix}/lib" ; then
+-    LIBDIRS="$LIBDIRS -L${openssl_prefix}/lib"
++  if test "${openssl_prefix}" != "/usr"; then
++    if test -d "${openssl_prefix}/include" ; then
++      INCLUDES="$INCLUDES -I${openssl_prefix}/include"
++    fi
++    if test -d "${openssl_prefix}/lib" ; then
++      LIBDIRS="$LIBDIRS -L${openssl_prefix}/lib"
++    fi
+   fi
+ 
+ fi
diff --git a/databases/postgresql80-server/files/patch-configure b/databases/postgresql80-server/files/patch-configure
new file mode 100644
index 000000000000..efeca517d300
--- /dev/null
+++ b/databases/postgresql80-server/files/patch-configure
@@ -0,0 +1,59 @@
+--- configure.orig	Wed Jun 26 21:28:24 2002
++++ configure	Wed Jun 26 21:35:16 2002
+@@ -2007,11 +2007,13 @@
+ EOF
+ 
+ 
+-  if test -d "$krb4_prefix/include"; then
+-    INCLUDES="$INCLUDES -I$krb4_prefix/include"
+-  fi
+-  if test -d "$krb4_prefix/lib"; then
+-    LIBDIRS="$LIBDIRS -L$krb4_prefix/lib"
++  if test "$krb4_prefix" != "/usr"; then
++    if test -d "$krb4_prefix/include"; then
++      INCLUDES="$INCLUDES -I$krb4_prefix/include"
++    fi
++    if test -d "$krb4_prefix/lib"; then
++      LIBDIRS="$LIBDIRS -L$krb4_prefix/lib"
++    fi
+   fi
+ 
+   krb_srvtab="/etc/srvtab"
+@@ -2052,11 +2054,13 @@
+ EOF
+ 
+ 
+-  if test -d "$krb5_prefix/include"; then
+-    INCLUDES="$INCLUDES -I$krb5_prefix/include"
+-  fi
+-  if test -d "$krb5_prefix/lib"; then
+-    LIBDIRS="$LIBDIRS -L$krb5_prefix/lib"
++  if test "$krb5_prefix" != "/usr"; then
++    if test -d "$krb5_prefix/include"; then
++      INCLUDES="$INCLUDES -I$krb5_prefix/include"
++    fi
++    if test -d "$krb5_prefix/lib"; then
++      LIBDIRS="$LIBDIRS -L$krb5_prefix/lib"
++    fi
+   fi
+ 
+   krb_srvtab="FILE:\$(sysconfdir)/krb5.keytab"
+@@ -2157,11 +2161,13 @@
+ EOF
+ 
+ 
+-  if test -d "${openssl_prefix}/include" ; then
+-    INCLUDES="$INCLUDES -I${openssl_prefix}/include"
+-  fi
+-  if test -d "${openssl_prefix}/lib" ; then
+-    LIBDIRS="$LIBDIRS -L${openssl_prefix}/lib"
++  if test "${openssl_prefix}" != "/usr"; then
++    if test -d "${openssl_prefix}/include" ; then
++      INCLUDES="$INCLUDES -I${openssl_prefix}/include"
++    fi
++    if test -d "${openssl_prefix}/lib" ; then
++      LIBDIRS="$LIBDIRS -L${openssl_prefix}/lib"
++    fi
+   fi
+ 
+ fi
diff --git a/databases/postgresql81-server/files/patch-configure b/databases/postgresql81-server/files/patch-configure
new file mode 100644
index 000000000000..efeca517d300
--- /dev/null
+++ b/databases/postgresql81-server/files/patch-configure
@@ -0,0 +1,59 @@
+--- configure.orig	Wed Jun 26 21:28:24 2002
++++ configure	Wed Jun 26 21:35:16 2002
+@@ -2007,11 +2007,13 @@
+ EOF
+ 
+ 
+-  if test -d "$krb4_prefix/include"; then
+-    INCLUDES="$INCLUDES -I$krb4_prefix/include"
+-  fi
+-  if test -d "$krb4_prefix/lib"; then
+-    LIBDIRS="$LIBDIRS -L$krb4_prefix/lib"
++  if test "$krb4_prefix" != "/usr"; then
++    if test -d "$krb4_prefix/include"; then
++      INCLUDES="$INCLUDES -I$krb4_prefix/include"
++    fi
++    if test -d "$krb4_prefix/lib"; then
++      LIBDIRS="$LIBDIRS -L$krb4_prefix/lib"
++    fi
+   fi
+ 
+   krb_srvtab="/etc/srvtab"
+@@ -2052,11 +2054,13 @@
+ EOF
+ 
+ 
+-  if test -d "$krb5_prefix/include"; then
+-    INCLUDES="$INCLUDES -I$krb5_prefix/include"
+-  fi
+-  if test -d "$krb5_prefix/lib"; then
+-    LIBDIRS="$LIBDIRS -L$krb5_prefix/lib"
++  if test "$krb5_prefix" != "/usr"; then
++    if test -d "$krb5_prefix/include"; then
++      INCLUDES="$INCLUDES -I$krb5_prefix/include"
++    fi
++    if test -d "$krb5_prefix/lib"; then
++      LIBDIRS="$LIBDIRS -L$krb5_prefix/lib"
++    fi
+   fi
+ 
+   krb_srvtab="FILE:\$(sysconfdir)/krb5.keytab"
+@@ -2157,11 +2161,13 @@
+ EOF
+ 
+ 
+-  if test -d "${openssl_prefix}/include" ; then
+-    INCLUDES="$INCLUDES -I${openssl_prefix}/include"
+-  fi
+-  if test -d "${openssl_prefix}/lib" ; then
+-    LIBDIRS="$LIBDIRS -L${openssl_prefix}/lib"
++  if test "${openssl_prefix}" != "/usr"; then
++    if test -d "${openssl_prefix}/include" ; then
++      INCLUDES="$INCLUDES -I${openssl_prefix}/include"
++    fi
++    if test -d "${openssl_prefix}/lib" ; then
++      LIBDIRS="$LIBDIRS -L${openssl_prefix}/lib"
++    fi
+   fi
+ 
+ fi
diff --git a/databases/postgresql82-server/files/patch-configure b/databases/postgresql82-server/files/patch-configure
new file mode 100644
index 000000000000..efeca517d300
--- /dev/null
+++ b/databases/postgresql82-server/files/patch-configure
@@ -0,0 +1,59 @@
+--- configure.orig	Wed Jun 26 21:28:24 2002
++++ configure	Wed Jun 26 21:35:16 2002
+@@ -2007,11 +2007,13 @@
+ EOF
+ 
+ 
+-  if test -d "$krb4_prefix/include"; then
+-    INCLUDES="$INCLUDES -I$krb4_prefix/include"
+-  fi
+-  if test -d "$krb4_prefix/lib"; then
+-    LIBDIRS="$LIBDIRS -L$krb4_prefix/lib"
++  if test "$krb4_prefix" != "/usr"; then
++    if test -d "$krb4_prefix/include"; then
++      INCLUDES="$INCLUDES -I$krb4_prefix/include"
++    fi
++    if test -d "$krb4_prefix/lib"; then
++      LIBDIRS="$LIBDIRS -L$krb4_prefix/lib"
++    fi
+   fi
+ 
+   krb_srvtab="/etc/srvtab"
+@@ -2052,11 +2054,13 @@
+ EOF
+ 
+ 
+-  if test -d "$krb5_prefix/include"; then
+-    INCLUDES="$INCLUDES -I$krb5_prefix/include"
+-  fi
+-  if test -d "$krb5_prefix/lib"; then
+-    LIBDIRS="$LIBDIRS -L$krb5_prefix/lib"
++  if test "$krb5_prefix" != "/usr"; then
++    if test -d "$krb5_prefix/include"; then
++      INCLUDES="$INCLUDES -I$krb5_prefix/include"
++    fi
++    if test -d "$krb5_prefix/lib"; then
++      LIBDIRS="$LIBDIRS -L$krb5_prefix/lib"
++    fi
+   fi
+ 
+   krb_srvtab="FILE:\$(sysconfdir)/krb5.keytab"
+@@ -2157,11 +2161,13 @@
+ EOF
+ 
+ 
+-  if test -d "${openssl_prefix}/include" ; then
+-    INCLUDES="$INCLUDES -I${openssl_prefix}/include"
+-  fi
+-  if test -d "${openssl_prefix}/lib" ; then
+-    LIBDIRS="$LIBDIRS -L${openssl_prefix}/lib"
++  if test "${openssl_prefix}" != "/usr"; then
++    if test -d "${openssl_prefix}/include" ; then
++      INCLUDES="$INCLUDES -I${openssl_prefix}/include"
++    fi
++    if test -d "${openssl_prefix}/lib" ; then
++      LIBDIRS="$LIBDIRS -L${openssl_prefix}/lib"
++    fi
+   fi
+ 
+ fi
diff --git a/databases/postgresql83-server/files/patch-configure b/databases/postgresql83-server/files/patch-configure
new file mode 100644
index 000000000000..efeca517d300
--- /dev/null
+++ b/databases/postgresql83-server/files/patch-configure
@@ -0,0 +1,59 @@
+--- configure.orig	Wed Jun 26 21:28:24 2002
++++ configure	Wed Jun 26 21:35:16 2002
+@@ -2007,11 +2007,13 @@
+ EOF
+ 
+ 
+-  if test -d "$krb4_prefix/include"; then
+-    INCLUDES="$INCLUDES -I$krb4_prefix/include"
+-  fi
+-  if test -d "$krb4_prefix/lib"; then
+-    LIBDIRS="$LIBDIRS -L$krb4_prefix/lib"
++  if test "$krb4_prefix" != "/usr"; then
++    if test -d "$krb4_prefix/include"; then
++      INCLUDES="$INCLUDES -I$krb4_prefix/include"
++    fi
++    if test -d "$krb4_prefix/lib"; then
++      LIBDIRS="$LIBDIRS -L$krb4_prefix/lib"
++    fi
+   fi
+ 
+   krb_srvtab="/etc/srvtab"
+@@ -2052,11 +2054,13 @@
+ EOF
+ 
+ 
+-  if test -d "$krb5_prefix/include"; then
+-    INCLUDES="$INCLUDES -I$krb5_prefix/include"
+-  fi
+-  if test -d "$krb5_prefix/lib"; then
+-    LIBDIRS="$LIBDIRS -L$krb5_prefix/lib"
++  if test "$krb5_prefix" != "/usr"; then
++    if test -d "$krb5_prefix/include"; then
++      INCLUDES="$INCLUDES -I$krb5_prefix/include"
++    fi
++    if test -d "$krb5_prefix/lib"; then
++      LIBDIRS="$LIBDIRS -L$krb5_prefix/lib"
++    fi
+   fi
+ 
+   krb_srvtab="FILE:\$(sysconfdir)/krb5.keytab"
+@@ -2157,11 +2161,13 @@
+ EOF
+ 
+ 
+-  if test -d "${openssl_prefix}/include" ; then
+-    INCLUDES="$INCLUDES -I${openssl_prefix}/include"
+-  fi
+-  if test -d "${openssl_prefix}/lib" ; then
+-    LIBDIRS="$LIBDIRS -L${openssl_prefix}/lib"
++  if test "${openssl_prefix}" != "/usr"; then
++    if test -d "${openssl_prefix}/include" ; then
++      INCLUDES="$INCLUDES -I${openssl_prefix}/include"
++    fi
++    if test -d "${openssl_prefix}/lib" ; then
++      LIBDIRS="$LIBDIRS -L${openssl_prefix}/lib"
++    fi
+   fi
+ 
+ fi
diff --git a/databases/postgresql84-server/files/patch-configure b/databases/postgresql84-server/files/patch-configure
new file mode 100644
index 000000000000..efeca517d300
--- /dev/null
+++ b/databases/postgresql84-server/files/patch-configure
@@ -0,0 +1,59 @@
+--- configure.orig	Wed Jun 26 21:28:24 2002
++++ configure	Wed Jun 26 21:35:16 2002
+@@ -2007,11 +2007,13 @@
+ EOF
+ 
+ 
+-  if test -d "$krb4_prefix/include"; then
+-    INCLUDES="$INCLUDES -I$krb4_prefix/include"
+-  fi
+-  if test -d "$krb4_prefix/lib"; then
+-    LIBDIRS="$LIBDIRS -L$krb4_prefix/lib"
++  if test "$krb4_prefix" != "/usr"; then
++    if test -d "$krb4_prefix/include"; then
++      INCLUDES="$INCLUDES -I$krb4_prefix/include"
++    fi
++    if test -d "$krb4_prefix/lib"; then
++      LIBDIRS="$LIBDIRS -L$krb4_prefix/lib"
++    fi
+   fi
+ 
+   krb_srvtab="/etc/srvtab"
+@@ -2052,11 +2054,13 @@
+ EOF
+ 
+ 
+-  if test -d "$krb5_prefix/include"; then
+-    INCLUDES="$INCLUDES -I$krb5_prefix/include"
+-  fi
+-  if test -d "$krb5_prefix/lib"; then
+-    LIBDIRS="$LIBDIRS -L$krb5_prefix/lib"
++  if test "$krb5_prefix" != "/usr"; then
++    if test -d "$krb5_prefix/include"; then
++      INCLUDES="$INCLUDES -I$krb5_prefix/include"
++    fi
++    if test -d "$krb5_prefix/lib"; then
++      LIBDIRS="$LIBDIRS -L$krb5_prefix/lib"
++    fi
+   fi
+ 
+   krb_srvtab="FILE:\$(sysconfdir)/krb5.keytab"
+@@ -2157,11 +2161,13 @@
+ EOF
+ 
+ 
+-  if test -d "${openssl_prefix}/include" ; then
+-    INCLUDES="$INCLUDES -I${openssl_prefix}/include"
+-  fi
+-  if test -d "${openssl_prefix}/lib" ; then
+-    LIBDIRS="$LIBDIRS -L${openssl_prefix}/lib"
++  if test "${openssl_prefix}" != "/usr"; then
++    if test -d "${openssl_prefix}/include" ; then
++      INCLUDES="$INCLUDES -I${openssl_prefix}/include"
++    fi
++    if test -d "${openssl_prefix}/lib" ; then
++      LIBDIRS="$LIBDIRS -L${openssl_prefix}/lib"
++    fi
+   fi
+ 
+ fi
diff --git a/databases/postgresql90-server/files/patch-configure b/databases/postgresql90-server/files/patch-configure
new file mode 100644
index 000000000000..efeca517d300
--- /dev/null
+++ b/databases/postgresql90-server/files/patch-configure
@@ -0,0 +1,59 @@
+--- configure.orig	Wed Jun 26 21:28:24 2002
++++ configure	Wed Jun 26 21:35:16 2002
+@@ -2007,11 +2007,13 @@
+ EOF
+ 
+ 
+-  if test -d "$krb4_prefix/include"; then
+-    INCLUDES="$INCLUDES -I$krb4_prefix/include"
+-  fi
+-  if test -d "$krb4_prefix/lib"; then
+-    LIBDIRS="$LIBDIRS -L$krb4_prefix/lib"
++  if test "$krb4_prefix" != "/usr"; then
++    if test -d "$krb4_prefix/include"; then
++      INCLUDES="$INCLUDES -I$krb4_prefix/include"
++    fi
++    if test -d "$krb4_prefix/lib"; then
++      LIBDIRS="$LIBDIRS -L$krb4_prefix/lib"
++    fi
+   fi
+ 
+   krb_srvtab="/etc/srvtab"
+@@ -2052,11 +2054,13 @@
+ EOF
+ 
+ 
+-  if test -d "$krb5_prefix/include"; then
+-    INCLUDES="$INCLUDES -I$krb5_prefix/include"
+-  fi
+-  if test -d "$krb5_prefix/lib"; then
+-    LIBDIRS="$LIBDIRS -L$krb5_prefix/lib"
++  if test "$krb5_prefix" != "/usr"; then
++    if test -d "$krb5_prefix/include"; then
++      INCLUDES="$INCLUDES -I$krb5_prefix/include"
++    fi
++    if test -d "$krb5_prefix/lib"; then
++      LIBDIRS="$LIBDIRS -L$krb5_prefix/lib"
++    fi
+   fi
+ 
+   krb_srvtab="FILE:\$(sysconfdir)/krb5.keytab"
+@@ -2157,11 +2161,13 @@
+ EOF
+ 
+ 
+-  if test -d "${openssl_prefix}/include" ; then
+-    INCLUDES="$INCLUDES -I${openssl_prefix}/include"
+-  fi
+-  if test -d "${openssl_prefix}/lib" ; then
+-    LIBDIRS="$LIBDIRS -L${openssl_prefix}/lib"
++  if test "${openssl_prefix}" != "/usr"; then
++    if test -d "${openssl_prefix}/include" ; then
++      INCLUDES="$INCLUDES -I${openssl_prefix}/include"
++    fi
++    if test -d "${openssl_prefix}/lib" ; then
++      LIBDIRS="$LIBDIRS -L${openssl_prefix}/lib"
++    fi
+   fi
+ 
+ fi
diff --git a/databases/postgresql91-server/files/patch-configure b/databases/postgresql91-server/files/patch-configure
new file mode 100644
index 000000000000..efeca517d300
--- /dev/null
+++ b/databases/postgresql91-server/files/patch-configure
@@ -0,0 +1,59 @@
+--- configure.orig	Wed Jun 26 21:28:24 2002
++++ configure	Wed Jun 26 21:35:16 2002
+@@ -2007,11 +2007,13 @@
+ EOF
+ 
+ 
+-  if test -d "$krb4_prefix/include"; then
+-    INCLUDES="$INCLUDES -I$krb4_prefix/include"
+-  fi
+-  if test -d "$krb4_prefix/lib"; then
+-    LIBDIRS="$LIBDIRS -L$krb4_prefix/lib"
++  if test "$krb4_prefix" != "/usr"; then
++    if test -d "$krb4_prefix/include"; then
++      INCLUDES="$INCLUDES -I$krb4_prefix/include"
++    fi
++    if test -d "$krb4_prefix/lib"; then
++      LIBDIRS="$LIBDIRS -L$krb4_prefix/lib"
++    fi
+   fi
+ 
+   krb_srvtab="/etc/srvtab"
+@@ -2052,11 +2054,13 @@
+ EOF
+ 
+ 
+-  if test -d "$krb5_prefix/include"; then
+-    INCLUDES="$INCLUDES -I$krb5_prefix/include"
+-  fi
+-  if test -d "$krb5_prefix/lib"; then
+-    LIBDIRS="$LIBDIRS -L$krb5_prefix/lib"
++  if test "$krb5_prefix" != "/usr"; then
++    if test -d "$krb5_prefix/include"; then
++      INCLUDES="$INCLUDES -I$krb5_prefix/include"
++    fi
++    if test -d "$krb5_prefix/lib"; then
++      LIBDIRS="$LIBDIRS -L$krb5_prefix/lib"
++    fi
+   fi
+ 
+   krb_srvtab="FILE:\$(sysconfdir)/krb5.keytab"
+@@ -2157,11 +2161,13 @@
+ EOF
+ 
+ 
+-  if test -d "${openssl_prefix}/include" ; then
+-    INCLUDES="$INCLUDES -I${openssl_prefix}/include"
+-  fi
+-  if test -d "${openssl_prefix}/lib" ; then
+-    LIBDIRS="$LIBDIRS -L${openssl_prefix}/lib"
++  if test "${openssl_prefix}" != "/usr"; then
++    if test -d "${openssl_prefix}/include" ; then
++      INCLUDES="$INCLUDES -I${openssl_prefix}/include"
++    fi
++    if test -d "${openssl_prefix}/lib" ; then
++      LIBDIRS="$LIBDIRS -L${openssl_prefix}/lib"
++    fi
+   fi
+ 
+ fi
diff --git a/databases/postgresql92-server/files/patch-configure b/databases/postgresql92-server/files/patch-configure
new file mode 100644
index 000000000000..efeca517d300
--- /dev/null
+++ b/databases/postgresql92-server/files/patch-configure
@@ -0,0 +1,59 @@
+--- configure.orig	Wed Jun 26 21:28:24 2002
++++ configure	Wed Jun 26 21:35:16 2002
+@@ -2007,11 +2007,13 @@
+ EOF
+ 
+ 
+-  if test -d "$krb4_prefix/include"; then
+-    INCLUDES="$INCLUDES -I$krb4_prefix/include"
+-  fi
+-  if test -d "$krb4_prefix/lib"; then
+-    LIBDIRS="$LIBDIRS -L$krb4_prefix/lib"
++  if test "$krb4_prefix" != "/usr"; then
++    if test -d "$krb4_prefix/include"; then
++      INCLUDES="$INCLUDES -I$krb4_prefix/include"
++    fi
++    if test -d "$krb4_prefix/lib"; then
++      LIBDIRS="$LIBDIRS -L$krb4_prefix/lib"
++    fi
+   fi
+ 
+   krb_srvtab="/etc/srvtab"
+@@ -2052,11 +2054,13 @@
+ EOF
+ 
+ 
+-  if test -d "$krb5_prefix/include"; then
+-    INCLUDES="$INCLUDES -I$krb5_prefix/include"
+-  fi
+-  if test -d "$krb5_prefix/lib"; then
+-    LIBDIRS="$LIBDIRS -L$krb5_prefix/lib"
++  if test "$krb5_prefix" != "/usr"; then
++    if test -d "$krb5_prefix/include"; then
++      INCLUDES="$INCLUDES -I$krb5_prefix/include"
++    fi
++    if test -d "$krb5_prefix/lib"; then
++      LIBDIRS="$LIBDIRS -L$krb5_prefix/lib"
++    fi
+   fi
+ 
+   krb_srvtab="FILE:\$(sysconfdir)/krb5.keytab"
+@@ -2157,11 +2161,13 @@
+ EOF
+ 
+ 
+-  if test -d "${openssl_prefix}/include" ; then
+-    INCLUDES="$INCLUDES -I${openssl_prefix}/include"
+-  fi
+-  if test -d "${openssl_prefix}/lib" ; then
+-    LIBDIRS="$LIBDIRS -L${openssl_prefix}/lib"
++  if test "${openssl_prefix}" != "/usr"; then
++    if test -d "${openssl_prefix}/include" ; then
++      INCLUDES="$INCLUDES -I${openssl_prefix}/include"
++    fi
++    if test -d "${openssl_prefix}/lib" ; then
++      LIBDIRS="$LIBDIRS -L${openssl_prefix}/lib"
++    fi
+   fi
+ 
+ fi