- Update to 0.6.2

- portlint
- utilize OPTIONS
- Add ODBC driver
- Pass Maintainership to submitter

PR:		64072
Submitted by:	Sergey Matveychuk <sem@ciam.ru>

8 files changed, 111 insertions, 1477 deletions

diff --git a/databases/hk_classes/Makefile b/databases/hk_classes/Makefile
index ad4ee855f0c3..6af51f19c779 100644
--- a/databases/hk_classes/Makefile
+++ b/databases/hk_classes/Makefile
@@ -5,46 +5,64 @@
 # $FreeBSD$
 
 PORTNAME=	hk_classes
-PORTVERSION=	0.6.1
-PORTREVISION=	2
+PORTVERSION=	0.6.2
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	hk-classes
 
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	"C++ Library for rapid development of database applications"
+MAINTAINER=	sem@ciam.ru
+COMMENT=	C++ Library for rapid development of database applications
 
 LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
 
-.if !defined(WITHOUT_MYSQL) || defined(WITH_MYSQL)
+USE_PYTHON=	yes
+CONFIGURE_ENV+=	LIBPYTHON="-l${PYTHON_VERSION} ${PTHREAD_LIBS}"
+CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+GNU_CONFIGURE=	yes
+INSTALLS_SHLIB=	yes
+USE_LIBTOOL=	yes
+LDCONFIG_DIRS+=	${PREFIX}/lib/hk_classes/
+
+OPTIONS=	MYSQL "Build MySQL driver" on \
+		POSTGRESQL "Build PostrgreSQL driver" off \
+		ODBC "Build unixODBC driver" off
+WITH_MYSQL?=	yes
+
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_MYSQL)
 USE_MYSQL=	yes
-CONFIGURE_ARGS+=	-with-mysql-dir=${LOCALBASE} \
-			--with-mysql-incdir=${LOCALBASE}/include/mysql
+CONFIGURE_ARGS+=	--with-mysql-dir=${LOCALBASE} \
+			--with-mysql-incdir=${LOCALBASE}/include/mysql \
+			--with-mysql-libdir=${LOCALBASE}/lib/mysql
 CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib -L${LOCALBASE}/lib/mysql"
 PLIST_SUB+=	MYSQL=""
 .else
+CONFIGURE_ARGS+=	--without-mysql
 PLIST_SUB+=	MYSQL="@comment "
 .endif
 
 .if defined(WITH_POSTGRESQL)
 POSTGRESQL_PORT?=	databases/postgresql7
-LIB_DEPENDS=		pq.3:${PORTSDIR}/${POSTGRESQL_PORT}
+LIB_DEPENDS+=		pq.3:${PORTSDIR}/${POSTGRESQL_PORT}
 CONFIGURE_ARGS+=	--with-postgres-incdir=${LOCALBASE}/include/ \
 			--with-postgres-libdir=${LOCALBASE}/lib
 CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib"
 PLIST_SUB+=	POSTGRESQL=""
 .else
+CONFIGURE_ARGS+=	--without-postgres
 PLIST_SUB+=	POSTGRESQL="@comment "
 .endif
 
-USE_PYTHON=	yes
-CONFIGURE_ENV+= LIBPYTHON="-l${PYTHON_VERSION} ${PTHREAD_LIBS}"
-CONFIGURE_TARGET=
-CONFIGURE_ARGS+=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-GNU_CONFIGURE=	yes
-INSTALLS_SHLIB=	yes
-USE_LIBTOOL=	yes
-LDCONFIG_DIRS+=	%%PREFIX%%/lib/hk_classes/
+.if defined(WITH_ODBC)
+LIB_DEPENDS+=		odbc.1:${PORTSDIR}/databases/unixODBC
+CONFIGURE_ARGS+=	--with-odbc-incdir=${LOCALBASE}/include/\
+			--with-odbc-libdir=${LOCALBASE}/lib
+PLIST_SUB+=	ODBC=""
+.else
+CONFIGURE_ARGS+=	--without-odbc
+PLIST_SUB+=	ODBC="@comment "
+.endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/databases/hk_classes/distinfo b/databases/hk_classes/distinfo
index 3b0d59dce9b3..5225899ad77a 100644
--- a/databases/hk_classes/distinfo
+++ b/databases/hk_classes/distinfo
@@ -1,2 +1,2 @@
-MD5 (hk_classes-0.6.1.tar.gz) = e376aaf0e8f266a4b7aa00b16349ae73
-SIZE (hk_classes-0.6.1.tar.gz) = 572958
+MD5 (hk_classes-0.6.2.tar.gz) = 2f5fb56ecf05018c080de9bdd7914892
+SIZE (hk_classes-0.6.2.tar.gz) = 578222
diff --git a/databases/hk_classes/files/patch-Makefile.in b/databases/hk_classes/files/patch-Makefile.in
deleted file mode 100644
index e9c212440da0..000000000000
--- a/databases/hk_classes/files/patch-Makefile.in
+++ /dev/null
@@ -1,16 +0,0 @@
---- Makefile.in.orig	Fri Oct 31 12:42:20 2003
-+++ Makefile.in	Fri Oct 31 12:42:44 2003
-@@ -562,11 +562,11 @@
- 
- 
- install-data-hook:
--	echo ; echo ; echo "**********************************************"; echo ; \
-+	@echo ; echo ; echo "**********************************************"; echo ; \
- 	if @NODRIVER@ ;then echo "W A R N I N G    !!!!" ;	 \
- 	echo "No database driver installed! It makes no sense to run " ; echo "hk_classes without a database driver."; echo "Make sure that you have one of the following SQL databases." ; echo ; echo "Existing drivers are: @POSSIBLE_DRIVERS@" ; echo ; echo "Then re-configure and re-make this package." ;\
- 	echo;echo "If you are sure the database is installed, but you still see this message,";	echo "check your installation. Probably you haven't installed your distribution's ";echo "development package for this database. For Mysql it is called ";echo "mysql-devel (the exact name is distribution specific)";\
--	else echo "The following drivers are installed:"; echo "@DRIVERSDIR@" ;fi;echo; if test "x@HKPYTHONDIR@" == "xpython" ; then echo "Python support is installed" ; else echo "No Python support";fi;echo ; echo "I wish you much fun";echo ; echo "Horst Knorr <hk_classes@knoda.org>";  echo; echo "**********************************************"; echo ;
-+	else echo "The following drivers are installed:"; echo "@DRIVERSDIR@" ;fi;echo; if test x@HKPYTHONDIR@ = xpython ; then echo "Python support is installed" ; else echo "No Python support";fi;echo ; echo "I wish you much fun";echo ; echo "Horst Knorr <hk_classes@knoda.org>";  echo; echo "**********************************************"; echo ;
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
diff --git a/databases/hk_classes/files/patch-configure b/databases/hk_classes/files/patch-configure
index 1c50b00819c6..a3543560018f 100644
--- a/databases/hk_classes/files/patch-configure
+++ b/databases/hk_classes/files/patch-configure
@@ -1,1432 +1,50 @@
---- configure.orig	Tue Nov  4 19:13:40 2003
-+++ configure	Tue Nov  4 19:15:08 2003
-@@ -8783,10 +8783,10 @@
+--- configure.orig	Sat Nov 15 19:04:37 2003
++++ configure	Thu Mar 11 00:21:00 2004
+@@ -7855,7 +7855,7 @@
+ 
+ 
+ # This can be used to rebuild libtool when needed
+-LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++LIBTOOL_DEPS="--disable-ltlibs /usr/local/share/libtool13/ltmain.sh"
+ 
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+@@ -8541,9 +8541,8 @@
+ NODRIVER=true
+ POSSIBLE_DRIVERS="MYSQL,ODBC, POSTGRESQL"
+ 
+-cat >>confdefs.h <<_ACEOF
+-#define HKCLASSES "$HK_CLASSESDIR"
+-_ACEOF
++echo -n "#define HKCLASSES " >>confdefs.h
++echo \"$prefix/lib/hk_classes\" >>confdefs.h
+ 
+ echo "$as_me:$LINENO: result: OK" >&5
+ echo "${ECHO_T}OK" >&6
+@@ -15667,7 +15666,7 @@
+ 
+ echo "$as_me:$LINENO: result: $mysql_lib" >&5
+ echo "${ECHO_T}$mysql_lib" >&6
+-if test $mysql_lib = yes ; then
++if test $mysql_lib = yes -a "x$with_mysql" != "xno"; then
+ NODRIVER=false
+ DRIVERSDIR="$DRIVERSDIR hk_mysqlclasses"
+ 
+@@ -15807,7 +15806,7 @@
+ 
+ echo "$as_me:$LINENO: result: $postgres_lib" >&5
+ echo "${ECHO_T}$postgres_lib" >&6
+-if test $postgres_lib = yes ; then
++if test $postgres_lib = yes -a "x$with_postgres" != "xno"; then
+ NODRIVER=false
+ DRIVERSDIR="$DRIVERSDIR hk_postgresclasses"
+ 
+@@ -15966,7 +15965,7 @@
+ 
+ echo "$as_me:$LINENO: result: $odbc_lib" >&5
+ echo "${ECHO_T}$odbc_lib" >&6
+-if test x$odbc_lib = xyes ; then
++if test x$odbc_lib = xyes -a "x$with_odbc" != "xno"; then
+ NODRIVER=false
+ DRIVERSDIR="$DRIVERSDIR hk_odbcclasses"
  
- 
- 
--if test -z ""2.2""; then
-+if test -z ""2.3""; then
-   version="1.5"
- else
--  version=""2.2""
-+  version=""2.3""
- fi
- 
- echo "$as_me:$LINENO: checking for Python$version" >&5
-@@ -8911,10 +8911,10 @@
- 
- 
- 
--if test -z ""2.1""; then
-+if test -z ""2.2""; then
-   version="1.5"
- else
--  version=""2.1""
-+  version=""2.2""
- fi
- 
- echo "$as_me:$LINENO: checking for Python$version" >&5
-@@ -9039,10 +9039,10 @@
- 
- 
- 
--if test -z ""2.0""; then
-+if test -z ""2.1""; then
-   version="1.5"
- else
--  version=""2.0""
-+  version=""2.1""
- fi
- 
- echo "$as_me:$LINENO: checking for Python$version" >&5
-@@ -9167,10 +9167,10 @@
- 
- 
- 
--if test -z ""; then
-+if test -z ""2.0""; then
-   version="1.5"
- else
--  version=""
-+  version=""2.0""
- fi
- 
- echo "$as_me:$LINENO: checking for Python$version" >&5
-@@ -9291,6 +9291,134 @@
-    test "x$PYTHONLIB" = "x-Lno" && PYTHONLIB=""
-    test "x$PYTHONINC" = "x-Ino" && PYTHONINC=""
- 
-+
-+
-+
-+
-+if test -z ""; then
-+  version="1.5"
-+else
-+  version=""
-+fi
-+
-+echo "$as_me:$LINENO: checking for Python$version" >&5
-+echo $ECHO_N "checking for Python$version... $ECHO_C" >&6
-+
-+python_incdirs="$ac_python_dir/include /usr/include /usr/local/include/ $kde_extra_includes"
-+
-+python_incdir=NO
-+for i in $python_incdirs;
-+do
-+  for j in Python.h;
-+  do
-+    echo "configure: 9314: $i/$j" >&5
-+    if test -r "$i/$j"; then
-+      echo "taking that" >&5
-+      python_incdir=$i
-+      break 2
-+    fi
-+  done
-+done
-+
-+if test ! -r $python_incdir/Python.h; then
-+
-+python_incdir=NO
-+for i in $python_incdirs;
-+do
-+  for j in python$version/Python.h;
-+  do
-+    echo "configure: 9330: $i/$j" >&5
-+    if test -r "$i/$j"; then
-+      echo "taking that" >&5
-+      python_incdir=$i
-+      break 2
-+    fi
-+  done
-+done
-+
-+  python_incdir=$python_incdir/python$version
-+  if test ! -r $python_incdir/Python.h; then
-+    python_incdir=no
-+  fi
-+fi
-+
-+PYTHONINC=-I$python_incdir
-+
-+python_libdirs="$ac_python_dir/lib /usr/lib /usr/local /usr/lib $kde_extra_libs"
-+
-+python_libdir=NO
-+for i in $python_libdirs;
-+do
-+  for j in libpython$version.a;
-+  do
-+    echo "configure: 9354: $i/$j" >&5
-+    if test -r "$i/$j"; then
-+      echo "taking that" >&5
-+      python_libdir=$i
-+      break 2
-+    fi
-+  done
-+done
-+
-+if test ! -r $python_libdir/libpython$version.a; then
-+
-+python_libdir=NO
-+for i in $python_libdirs;
-+do
-+  for j in python$version/config/libpython$version.a;
-+  do
-+    echo "configure: 9370: $i/$j" >&5
-+    if test -r "$i/$j"; then
-+      echo "taking that" >&5
-+      python_libdir=$i
-+      break 2
-+    fi
-+  done
-+done
-+
-+  python_libdir=$python_libdir/python$version/config
-+  if test ! -r $python_libdir/libpython$version.a; then
-+    python_libdir=no
-+  fi
-+fi
-+
-+PYTHONLIB=-L$python_libdir
-+kde_orig_LIBPYTHON=$LIBPYTHON
-+if test -z "$LIBPYTHON"; then
-+  LIBPYTHON=-lpython$version
-+fi
-+
-+python_libdirs="$ac_python_dir/lib /usr/lib /usr/local /usr/lib $kde_extra_libs"
-+
-+python_moddir=NO
-+for i in $python_libdirs;
-+do
-+  for j in python$version/copy.py;
-+  do
-+    echo "configure: 9398: $i/$j" >&5
-+    if test -r "$i/$j"; then
-+      echo "taking that" >&5
-+      python_moddir=$i
-+      break 2
-+    fi
-+  done
-+done
-+
-+python_moddir=$python_moddir/python$version
-+if test ! -r $python_moddir/copy.py; then
-+  python_moddir=no
-+fi
-+
-+PYTHONMODDIR=$python_moddir
-+
-+echo "$as_me:$LINENO: result: header $python_incdir library $python_libdir modules $python_moddir" >&5
-+echo "${ECHO_T}header $python_incdir library $python_libdir modules $python_moddir" >&6
-+
-+if test x$python_incdir = xno ||  test x$python_libdir = xno ||  test x$python_moddir = xno; then
-+   LIBPYTHON=$kde_orig_LIBPYTHON
-+   test "x$PYTHONLIB" = "x-Lno" && PYTHONLIB=""
-+   test "x$PYTHONINC" = "x-Ino" && PYTHONINC=""
-+
- else
-     kde_python_link_found=no
- 
-@@ -11762,6 +11890,1242 @@
- 
- fi
- 
-+
-+
-+else
-+    kde_python_link_found=no
-+
-+if test "$kde_python_link_found" = no; then
-+
-+if test "normal" = normal; then
-+  echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+  echo "$as_me:$LINENO: checking if Python depends on " >&5
-+echo $ECHO_N "checking if Python depends on ... $ECHO_C" >&6
-+fi
-+
-+if test "${kde_cv_try_link_python_normal+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+
-+
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON  $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-+
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+#include <Python.h>
-+
-+int
-+main ()
-+{
-+
-+	PySys_SetArgv(1, 0);
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+  (eval $ac_link) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest$ac_exeext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  kde_cv_try_link_python_normal=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+kde_cv_try_link_python_normal=no
-+
-+fi
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-+
-+fi
-+
-+
-+if test "$kde_cv_try_link_python_normal" = "yes"; then
-+  echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+  kde_python_link_found=yes
-+  if test ! "normal" = normal; then
-+    LIBPYTHON="$LIBPYTHON "
-+  fi
-+
-+else
-+  echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+
-+fi
-+ac_ext=cc
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+
-+fi
-+
-+
-+
-+if test "$kde_python_link_found" = no; then
-+
-+if test "m" = normal; then
-+  echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+  echo "$as_me:$LINENO: checking if Python depends on -lm" >&5
-+echo $ECHO_N "checking if Python depends on -lm... $ECHO_C" >&6
-+fi
-+
-+if test "${kde_cv_try_link_python_m+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+
-+
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON -lm $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-+
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+#include <Python.h>
-+
-+int
-+main ()
-+{
-+
-+	PySys_SetArgv(1, 0);
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+  (eval $ac_link) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest$ac_exeext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  kde_cv_try_link_python_m=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+kde_cv_try_link_python_m=no
-+
-+fi
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-+
-+fi
-+
-+
-+if test "$kde_cv_try_link_python_m" = "yes"; then
-+  echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+  kde_python_link_found=yes
-+  if test ! "m" = normal; then
-+    LIBPYTHON="$LIBPYTHON -lm"
-+  fi
-+
-+else
-+  echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+
-+fi
-+ac_ext=cc
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+
-+fi
-+
-+
-+
-+if test "$kde_python_link_found" = no; then
-+
-+if test "pthread" = normal; then
-+  echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+  echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD... $ECHO_C" >&6
-+fi
-+
-+if test "${kde_cv_try_link_python_pthread+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+
-+
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBPTHREAD $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-+
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+#include <Python.h>
-+
-+int
-+main ()
-+{
-+
-+	PySys_SetArgv(1, 0);
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+  (eval $ac_link) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest$ac_exeext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  kde_cv_try_link_python_pthread=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+kde_cv_try_link_python_pthread=no
-+
-+fi
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-+
-+fi
-+
-+
-+if test "$kde_cv_try_link_python_pthread" = "yes"; then
-+  echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+  kde_python_link_found=yes
-+  if test ! "pthread" = normal; then
-+    LIBPYTHON="$LIBPYTHON $LIBPTHREAD"
-+  fi
-+
-+else
-+  echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+
-+fi
-+ac_ext=cc
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+
-+fi
-+
-+
-+
-+if test "$kde_python_link_found" = no; then
-+
-+if test "tcl" = normal; then
-+  echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+  echo "$as_me:$LINENO: checking if Python depends on -ltcl" >&5
-+echo $ECHO_N "checking if Python depends on -ltcl... $ECHO_C" >&6
-+fi
-+
-+if test "${kde_cv_try_link_python_tcl+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+
-+
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON -ltcl $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-+
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+#include <Python.h>
-+
-+int
-+main ()
-+{
-+
-+	PySys_SetArgv(1, 0);
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+  (eval $ac_link) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest$ac_exeext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  kde_cv_try_link_python_tcl=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+kde_cv_try_link_python_tcl=no
-+
-+fi
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-+
-+fi
-+
-+
-+if test "$kde_cv_try_link_python_tcl" = "yes"; then
-+  echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+  kde_python_link_found=yes
-+  if test ! "tcl" = normal; then
-+    LIBPYTHON="$LIBPYTHON -ltcl"
-+  fi
-+
-+else
-+  echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+
-+fi
-+ac_ext=cc
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+
-+fi
-+
-+
-+
-+if test "$kde_python_link_found" = no; then
-+
-+if test "db2" = normal; then
-+  echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+  echo "$as_me:$LINENO: checking if Python depends on -ldb2" >&5
-+echo $ECHO_N "checking if Python depends on -ldb2... $ECHO_C" >&6
-+fi
-+
-+if test "${kde_cv_try_link_python_db2+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+
-+
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON -ldb2 $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-+
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+#include <Python.h>
-+
-+int
-+main ()
-+{
-+
-+	PySys_SetArgv(1, 0);
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+  (eval $ac_link) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest$ac_exeext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  kde_cv_try_link_python_db2=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+kde_cv_try_link_python_db2=no
-+
-+fi
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-+
-+fi
-+
-+
-+if test "$kde_cv_try_link_python_db2" = "yes"; then
-+  echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+  kde_python_link_found=yes
-+  if test ! "db2" = normal; then
-+    LIBPYTHON="$LIBPYTHON -ldb2"
-+  fi
-+
-+else
-+  echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+
-+fi
-+ac_ext=cc
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+
-+fi
-+
-+
-+
-+if test "$kde_python_link_found" = no; then
-+
-+if test "m_and_thread" = normal; then
-+  echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+  echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm... $ECHO_C" >&6
-+fi
-+
-+if test "${kde_cv_try_link_python_m_and_thread+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+
-+
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBPTHREAD -lm $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-+
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+#include <Python.h>
-+
-+int
-+main ()
-+{
-+
-+	PySys_SetArgv(1, 0);
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+  (eval $ac_link) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest$ac_exeext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  kde_cv_try_link_python_m_and_thread=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+kde_cv_try_link_python_m_and_thread=no
-+
-+fi
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-+
-+fi
-+
-+
-+if test "$kde_cv_try_link_python_m_and_thread" = "yes"; then
-+  echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+  kde_python_link_found=yes
-+  if test ! "m_and_thread" = normal; then
-+    LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm"
-+  fi
-+
-+else
-+  echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+
-+fi
-+ac_ext=cc
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+
-+fi
-+
-+
-+
-+if test "$kde_python_link_found" = no; then
-+
-+if test "m_and_thread_and_util" = normal; then
-+  echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+  echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -lutil" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -lutil... $ECHO_C" >&6
-+fi
-+
-+if test "${kde_cv_try_link_python_m_and_thread_and_util+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+
-+
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBPTHREAD -lm -lutil $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-+
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+#include <Python.h>
-+
-+int
-+main ()
-+{
-+
-+	PySys_SetArgv(1, 0);
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+  (eval $ac_link) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest$ac_exeext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  kde_cv_try_link_python_m_and_thread_and_util=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+kde_cv_try_link_python_m_and_thread_and_util=no
-+
-+fi
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-+
-+fi
-+
-+
-+if test "$kde_cv_try_link_python_m_and_thread_and_util" = "yes"; then
-+  echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+  kde_python_link_found=yes
-+  if test ! "m_and_thread_and_util" = normal; then
-+    LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -lutil"
-+  fi
-+
-+else
-+  echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+
-+fi
-+ac_ext=cc
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+
-+fi
-+
-+
-+
-+if test "$kde_python_link_found" = no; then
-+
-+if test "m_and_thread_and_db3" = normal; then
-+  echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+  echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb-3 -lutil" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb-3 -lutil... $ECHO_C" >&6
-+fi
-+
-+if test "${kde_cv_try_link_python_m_and_thread_and_db3+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+
-+
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBPTHREAD -lm -ldb-3 -lutil $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-+
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+#include <Python.h>
-+
-+int
-+main ()
-+{
-+
-+	PySys_SetArgv(1, 0);
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+  (eval $ac_link) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest$ac_exeext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  kde_cv_try_link_python_m_and_thread_and_db3=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+kde_cv_try_link_python_m_and_thread_and_db3=no
-+
-+fi
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-+
-+fi
-+
-+
-+if test "$kde_cv_try_link_python_m_and_thread_and_db3" = "yes"; then
-+  echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+  kde_python_link_found=yes
-+  if test ! "m_and_thread_and_db3" = normal; then
-+    LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -ldb-3 -lutil"
-+  fi
-+
-+else
-+  echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+
-+fi
-+ac_ext=cc
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+
-+fi
-+
-+
-+
-+if test "$kde_python_link_found" = no; then
-+
-+if test "pthread_and_db3" = normal; then
-+  echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+  echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -ldb-3" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -ldb-3... $ECHO_C" >&6
-+fi
-+
-+if test "${kde_cv_try_link_python_pthread_and_db3+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+
-+
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBPTHREAD -ldb-3 $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-+
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+#include <Python.h>
-+
-+int
-+main ()
-+{
-+
-+	PySys_SetArgv(1, 0);
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+  (eval $ac_link) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest$ac_exeext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  kde_cv_try_link_python_pthread_and_db3=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+kde_cv_try_link_python_pthread_and_db3=no
-+
-+fi
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-+
-+fi
-+
-+
-+if test "$kde_cv_try_link_python_pthread_and_db3" = "yes"; then
-+  echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+  kde_python_link_found=yes
-+  if test ! "pthread_and_db3" = normal; then
-+    LIBPYTHON="$LIBPYTHON $LIBPTHREAD -ldb-3"
-+  fi
-+
-+else
-+  echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+
-+fi
-+ac_ext=cc
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+
-+fi
-+
-+
-+
-+if test "$kde_python_link_found" = no; then
-+
-+if test "m_and_thread_and_db" = normal; then
-+  echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+  echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb -ltermcap -lutil" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb -ltermcap -lutil... $ECHO_C" >&6
-+fi
-+
-+if test "${kde_cv_try_link_python_m_and_thread_and_db+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+
-+
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBPTHREAD -lm -ldb -ltermcap -lutil $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-+
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+#include <Python.h>
-+
-+int
-+main ()
-+{
-+
-+	PySys_SetArgv(1, 0);
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+  (eval $ac_link) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest$ac_exeext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  kde_cv_try_link_python_m_and_thread_and_db=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+kde_cv_try_link_python_m_and_thread_and_db=no
-+
-+fi
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-+
-+fi
-+
-+
-+if test "$kde_cv_try_link_python_m_and_thread_and_db" = "yes"; then
-+  echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+  kde_python_link_found=yes
-+  if test ! "m_and_thread_and_db" = normal; then
-+    LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -ldb -ltermcap -lutil"
-+  fi
-+
-+else
-+  echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+
-+fi
-+ac_ext=cc
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+
-+fi
-+
-+
-+
-+if test "$kde_python_link_found" = no; then
-+
-+if test "pthread_and_dl" = normal; then
-+  echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+  echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm... $ECHO_C" >&6
-+fi
-+
-+if test "${kde_cv_try_link_python_pthread_and_dl+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+
-+
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-+
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+#include <Python.h>
-+
-+int
-+main ()
-+{
-+
-+	PySys_SetArgv(1, 0);
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+  (eval $ac_link) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest$ac_exeext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  kde_cv_try_link_python_pthread_and_dl=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+kde_cv_try_link_python_pthread_and_dl=no
-+
-+fi
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-+
-+fi
-+
-+
-+if test "$kde_cv_try_link_python_pthread_and_dl" = "yes"; then
-+  echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+  kde_python_link_found=yes
-+  if test ! "pthread_and_dl" = normal; then
-+    LIBPYTHON="$LIBPYTHON $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm"
-+  fi
-+
-+else
-+  echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+
-+fi
-+ac_ext=cc
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+
-+fi
-+
-+
-+
-+if test "$kde_python_link_found" = no; then
-+
-+if test "m_and_thread_and_db_special" = normal; then
-+  echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+else
-+  echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb -lutil" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb -lutil... $ECHO_C" >&6
-+fi
-+
-+if test "${kde_cv_try_link_python_m_and_thread_and_db_special+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+
-+
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+kde_save_cflags="$CFLAGS"
-+CFLAGS="$CFLAGS $PYTHONINC"
-+kde_save_libs="$LIBS"
-+LIBS="$LIBS $LIBPYTHON $LIBPTHREAD -lm -ldb -lutil $LIBDL $LIBSOCKET"
-+kde_save_ldflags="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $PYTHONLIB"
-+
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+#include <Python.h>
-+
-+int
-+main ()
-+{
-+
-+	PySys_SetArgv(1, 0);
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+  (eval $ac_link) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest$ac_exeext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  kde_cv_try_link_python_m_and_thread_and_db_special=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+kde_cv_try_link_python_m_and_thread_and_db_special=no
-+
-+fi
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+CFLAGS="$kde_save_cflags"
-+LIBS="$kde_save_libs"
-+LDFLAGS="$kde_save_ldflags"
-+
-+fi
-+
-+
-+if test "$kde_cv_try_link_python_m_and_thread_and_db_special" = "yes"; then
-+  echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+  kde_python_link_found=yes
-+  if test ! "m_and_thread_and_db_special" = normal; then
-+    LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -ldb -lutil"
-+  fi
-+
-+else
-+  echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+  { { echo "$as_me:$LINENO: error: it seems, Python depends on another library.
-+    Pleae set LIBPYTHON to '-lpython$version -lotherlib' before calling configure to fix this
-+    and contact the authors to let them know about this problem" >&5
-+echo "$as_me: error: it seems, Python depends on another library.
-+    Pleae set LIBPYTHON to '-lpython$version -lotherlib' before calling configure to fix this
-+    and contact the authors to let them know about this problem" >&2;}
-+   { (exit 1); exit 1; }; }
-+
-+fi
-+ac_ext=cc
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+
-+fi
-+
-+
-+
-+  LIBPYTHON="$LIBPYTHON $LIBDL $LIBSOCKET"
-+
-+
-+
-+
-+HKPYTHONDIR="python"
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_PYTHON 1
-+_ACEOF
-+
-+fi
- 
- 
- else
diff --git a/databases/hk_classes/files/patch-hk_classes::hk_actionquery.cpp b/databases/hk_classes/files/patch-hk_classes::hk_actionquery.cpp
new file mode 100644
index 000000000000..9889f7cbf73a
--- /dev/null
+++ b/databases/hk_classes/files/patch-hk_classes::hk_actionquery.cpp
@@ -0,0 +1,11 @@
+--- hk_classes/hk_actionquery.cpp.orig	Wed Mar 10 22:55:49 2004
++++ hk_classes/hk_actionquery.cpp	Wed Mar 10 22:56:40 2004
+@@ -12,6 +12,8 @@
+ #include "hk_actionquery.h"
+ #include "hk_database.h"
+ 
++#include <time.h>
++
+ class hk_actionqueryprivate
+ {
+ public:
diff --git a/databases/hk_classes/files/patch-hk_classes::hk_datasource.cpp b/databases/hk_classes/files/patch-hk_classes::hk_datasource.cpp
new file mode 100644
index 000000000000..baa57b1973c7
--- /dev/null
+++ b/databases/hk_classes/files/patch-hk_classes::hk_datasource.cpp
@@ -0,0 +1,11 @@
+--- hk_classes/hk_datasource.cpp.orig	Wed Mar 10 22:57:45 2004
++++ hk_classes/hk_datasource.cpp	Wed Mar 10 22:58:01 2004
+@@ -19,7 +19,7 @@
+ #include <algorithm>
+ #include <list>
+ #include <stdlib.h>
+-
++#include <time.h>
+ 
+ class hk_datasourceprivate
+ {
diff --git a/databases/hk_classes/files/patch-hk_drivermanager.cpp b/databases/hk_classes/files/patch-hk_drivermanager.cpp
deleted file mode 100644
index 9f405fe04408..000000000000
--- a/databases/hk_classes/files/patch-hk_drivermanager.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- hk_classes/hk_drivermanager.cpp.orig	Fri Oct 31 12:14:16 2003
-+++ hk_classes/hk_drivermanager.cpp	Fri Oct 31 12:14:25 2003
-@@ -141,7 +141,7 @@
-     {
-         if (interactive)
- 	{
--	   char* e=dlerror();
-+	   const char* e=dlerror();
- 	   hk_string error=hk_translate("Unknown reason");
- 	   if (e) error=e;
- 	   hk_string w=hk_translate("Database driver '%DRIVER%' could not be loaded.\nReason: ")+error;
diff --git a/databases/hk_classes/pkg-plist b/databases/hk_classes/pkg-plist
index 797d89ddf7ea..f0e7d20f7145 100644
--- a/databases/hk_classes/pkg-plist
+++ b/databases/hk_classes/pkg-plist
@@ -40,6 +40,9 @@ include/hk_classes/hk_interpreter.h
 %%MYSQL%%lib/hk_classes/drivers/libhk_mysqldriver.so.3
 %%MYSQL%%lib/hk_classes/drivers/libhk_mysqldriver.so
 %%MYSQL%%lib/hk_classes/drivers/libhk_mysqldriver.la
+%%ODBC%%lib/hk_classes/drivers/libhk_odbcdriver.la
+%%ODBC%%lib/hk_classes/drivers/libhk_odbcdriver.so
+%%ODBC%%lib/hk_classes/drivers/libhk_odbcdriver.so.0
 %%POSTGRESQL%%lib/hk_classes/drivers/libhk_postgresdriver.so.0
 %%POSTGRESQL%%lib/hk_classes/drivers/libhk_postgresdriver.so
 %%POSTGRESQL%%lib/hk_classes/drivers/libhk_postgresdriver.la