3 files changed, 95 insertions, 56 deletions

diff --git a/databases/unixODBC/files/patch-aa b/databases/unixODBC/files/patch-aa
deleted file mode 100644
index d4f45fe5a00e..000000000000
--- a/databases/unixODBC/files/patch-aa
+++ /dev/null
@@ -1,56 +0,0 @@
---- configure.orig	Tue Nov 14 20:11:45 2000
-+++ configure	Sat Nov 25 14:16:03 2000
-@@ -2578,14 +2578,14 @@
- 
- 
- if test "x$thread" = "xtrue"; then
--  echo $ac_n "checking for pthread_mutex_lock  in -lpthread""... $ac_c" 1>&6
--echo "configure:2583: checking for pthread_mutex_lock  in -lpthread" >&5
-+  echo $ac_n "checking for pthread_mutex_lock  in -pthread""... $ac_c" 1>&6
-+echo "configure:2583: checking for pthread_mutex_lock  in -pthread" >&5
- ac_lib_var=`echo pthread'_'pthread_mutex_lock  | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_save_LIBS="$LIBS"
--LIBS="-lpthread  $LIBS"
-+LIBS="-pthread  $LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 2591 "configure"
- #include "confdefs.h"
-@@ -2619,7 +2619,7 @@
- #define $ac_tr_lib 1
- EOF
- 
--  LIBS="-lpthread $LIBS"
-+  LIBS="-pthread $LIBS"
- 
- else
-   echo "$ac_t""no" 1>&6
-@@ -3323,7 +3323,7 @@
- 
- 
- 
--LIBQT="-lqt"
-+LIBQT="-lqt2"
- if test $kde_qtver = 2; then
-   
-   
-@@ -3531,7 +3531,7 @@
- 
- CXXFLAGS="$CXXFLAGS -I$qt_includes"
- LDFLAGS="$X_LDFLAGS"
--LIBS="-lqt -lXext -lX11 $LIBSOCKET"
-+LIBS="-lqt2 -lXext -lX11 $LIBSOCKET"
- LD_LIBRARY_PATH=
- export LD_LIBRARY_PATH
- LIBRARY_PATH=
-@@ -3695,7 +3695,7 @@
-    
- 
- 
--LIB_QT='-lqt $(LIBPNG) -lXext $(LIB_X11)'
-+LIB_QT='-lqt2 $(LIBPNG) -lXext $(LIB_X11)'
- 
- 
- 
diff --git a/databases/unixODBC/files/patch-ab b/databases/unixODBC/files/patch-ab
new file mode 100644
index 000000000000..f4b5fe3d8f8f
--- /dev/null
+++ b/databases/unixODBC/files/patch-ab
@@ -0,0 +1,47 @@
+--- aclocal.m4.orig	Fri Jan  5 00:08:12 2001
++++ aclocal.m4	Sat Jan  6 06:48:33 2001
+@@ -518,7 +518,7 @@
+ 
+ CXXFLAGS="$CXXFLAGS -I$qt_includes"
+ LDFLAGS="$X_LDFLAGS"
+-LIBS="-lqt -lXext -lX11 $LIBSOCKET"
++LIBS="-lqt2 -lXext -lX11 $LIBSOCKET"
+ LD_LIBRARY_PATH=
+ export LD_LIBRARY_PATH
+ LIBRARY_PATH=
+@@ -565,7 +565,7 @@
+ [
+ AC_REQUIRE([K_PATH_X])
+ AC_REQUIRE([KDE_USE_QT])
+-LIBQT="-lqt"
++LIBQT="-lqt2"
+ if test $kde_qtver = 2; then
+   
+   AC_REQUIRE([AC_FIND_PNG])
+@@ -704,7 +704,7 @@
+ AC_SUBST(QT_LDFLAGS)
+ AC_PATH_QT_MOC
+ 
+-LIB_QT='-lqt $(LIBPNG) -lXext $(LIB_X11)'
++LIB_QT='-lqt2 $(LIBPNG) -lXext $(LIB_X11)'
+ AC_SUBST(LIB_QT)
+ 
+ ])
+@@ -2587,7 +2587,7 @@
+ 
+ AC_DEFUN(KDE_CHECK_LIBPTHREAD,
+ [
+-AC_CHECK_LIB(pthread, pthread_create, [LIBPTHREAD="-lpthread"], LIBPTHREAD= )
++AC_CHECK_FUNC(c_r, pthread_create, [LIBPTHREAD="-pthread"], LIBPTHREAD= )
+ AC_SUBST(LIBPTHREAD)
+ ])
+ 
+@@ -2709,7 +2709,7 @@
+ kde_python_link_found=no
+ KDE_TRY_LINK_PYTHON(normal)
+ KDE_TRY_LINK_PYTHON(m, -lm)
+-KDE_TRY_LINK_PYTHON(pthread, $LIBPTHREAD)
++KDE_TRY_LINK_PYTHON(c_r, $LIBPTHREAD)
+ KDE_TRY_LINK_PYTHON(tcl, -ltcl)
+ KDE_TRY_LINK_PYTHON(m_and_thread, [$LIBPTHREAD -lm], [],
+ 	[AC_MSG_WARN([it seems, Python depends on another library. 
diff --git a/databases/unixODBC/files/patch-ac b/databases/unixODBC/files/patch-ac
new file mode 100644
index 000000000000..46e725c8eeda
--- /dev/null
+++ b/databases/unixODBC/files/patch-ac
@@ -0,0 +1,48 @@
+--- configure.in.orig	Fri Jan  5 00:07:39 2001
++++ configure.in	Sat Jan  6 06:53:02 2001
+@@ -97,8 +97,8 @@
+ 	AC_DEFINE(HAVE_READLINE, 1)])
+ AC_SUBST(READLINE)
+ 
+-AC_CHECK_LIB(c, strcasecmp, [AC_DEFINE(HAVE_STRCASECMP, 1)])
+-AC_CHECK_LIB(c, strncasecmp, [AC_DEFINE(HAVE_STRNCASECMP, 1)])
++AC_CHECK_FUNC(c, strcasecmp, [AC_DEFINE(HAVE_STRCASECMP, 1)])
++AC_CHECK_FUNC(c, strncasecmp, [AC_DEFINE(HAVE_STRNCASECMP, 1)])
+ 
+ LIBADD_DL=
+ AC_CHECK_LIB(dl, dlopen, [AC_DEFINE(HAVE_LIBDL, 1) LIBADD_DL="-ldl"],
+@@ -121,25 +121,26 @@
+     AC_DEFINE(HAVE_LIBPTH,1)
+   else
+     AC_CHECK_LIB(pthread, pthread_mutex_lock )
+-    AC_CHECK_LIB(pthread, pthread_mutex_lock, 
++    AC_CHECK_FUNC(c_r, pthread_mutex_lock, 
+     [
+       AC_DEFINE(HAVE_LIBPTHREAD,1)
+       if test "x$ac_cv_prog_gcc"="xyes"; then
+-        CFLAGS="$CFLAGS -pthread"
++        LIBS="$LIBS -pthread"
++        AC_DEFINE(_THREAD_SAFE,1)
+       fi
+     ] )
+ 
+     AC_CHECK_LIB(thread, mutex_lock )
+-    AC_CHECK_LIB(c, localtime_r, [AC_DEFINE(HAVE_LOCALTIME_R, 1)] )
++    AC_CHECK_FUNC(c, localtime_r, [AC_DEFINE(HAVE_LOCALTIME_R, 1)] )
+   fi
+ fi
+ 
+ if test "x$stats" = "xtrue"; then
+-  AC_CHECK_LIB( c, ftok,[],[stats=false] )
+-  AC_CHECK_LIB( c, semget,[],[stats=false] )
+-  AC_CHECK_LIB( c, shmget,[],[stats=false] )
+-  AC_CHECK_LIB( c, semop,[],[stats=false] )
+-  AC_CHECK_LIB( c, snprintf, [AC_DEFINE(HAVE_SNPRINTF)],[stats=false] )
++  AC_CHECK_FUNC( c, ftok,[],[stats=false] )
++  AC_CHECK_FUNC( c, semget,[],[stats=false] )
++  AC_CHECK_FUNC( c, shmget,[],[stats=false] )
++  AC_CHECK_FUNC( c, semop,[],[stats=false] )
++  AC_CHECK_FUNC( c, snprintf, [AC_DEFINE(HAVE_SNPRINTF)],[stats=false] )
+ fi
+ 
+ if test "x$stats" = "xtrue"; then