update kmysqladmin to 0.7.0

ported to kde3 and lots of bugfixes.

8 files changed, 106 insertions, 87 deletions

diff --git a/databases/kmysqladmin/DESCR b/databases/kmysqladmin/DESCR
index 668eabe7889..29854e7693a 100644
--- a/databases/kmysqladmin/DESCR
+++ b/databases/kmysqladmin/DESCR
@@ -1,2 +1,2 @@
 Kmysqladmin is a GUI for administrating a MySQL installation
-under KDE/QT  Kmysqladmin-0.5.1 specifically works with KDE2.
+under KDE/QT.
diff --git a/databases/kmysqladmin/Makefile b/databases/kmysqladmin/Makefile
index 526a64a255f..cafdaee7231 100644
--- a/databases/kmysqladmin/Makefile
+++ b/databases/kmysqladmin/Makefile
@@ -1,23 +1,25 @@
-# $NetBSD: Makefile,v 1.19 2004/11/07 17:16:34 kristerw Exp $
+# $NetBSD: Makefile,v 1.20 2004/12/27 23:35:01 markd Exp $
 
-DISTNAME=	kmysqladmin-0.5.1
-PKGREVISION=	7
+DISTNAME=	kmysqladmin-0.7.0
 CATEGORIES=	databases kde
-MASTER_SITES=	http://www.webeifer.de/alwin/programs/download/kmysqladmin/
+MASTER_SITES=	http://www.alwins-world.de/programs/download/kmysqladmin/
 
 MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=       http://www.alwins-world.de/programs/kmysqladmin/
 COMMENT=	MySQL administration GUI
 
 USE_BUILDLINK3=		YES
+USE_LANGUAGES=		c c++
+USE_LIBTOOL=		YES
 GNU_CONFIGURE=		YES
 
 MYSQLDIR=		${BUILDLINK_PREFIX.mysql-client}
-CONFIGURE_ARGS+=	--with-mysql-includes=${MYSQLDIR}/include/mysql
-CONFIGURE_ARGS+=	--with-mysql-libs=${MYSQLDIR}/lib/mysql
+CONFIGURE_ARGS+=	--with-mysql-include=${MYSQLDIR}/include/mysql
+CONFIGURE_ARGS+=	--with-mysql-lib=${MYSQLDIR}/lib/mysql
 
 .include "../../mk/mysql.buildlink3.mk"
-.include "../../x11/kde2/kde2.mk"
-.include "../../x11/kdebase2/buildlink3.mk"
+.include "../../meta-pkgs/kde3/kde3.mk"
+.include "../../x11/kdebase3/buildlink3.mk"
+.include "../../x11/kdelibs3/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/kmysqladmin/PLIST b/databases/kmysqladmin/PLIST
index a76fdf9aac8..cf79cfcd4b5 100644
--- a/databases/kmysqladmin/PLIST
+++ b/databases/kmysqladmin/PLIST
@@ -1,23 +1,38 @@
-@comment $NetBSD: PLIST,v 1.2 2001/11/13 21:13:39 jlam Exp $
+@comment $NetBSD: PLIST,v 1.3 2004/12/27 23:35:01 markd Exp $
 bin/kmysqladmin
-share/doc/kde/HTML/en/kmysqladmin/index.sgml
-share/doc/kde/HTML/en/kmysqladmin/index.xml
-share/doc/kde/HTML/en/kmysqladmin/index-1.html
-share/doc/kde/HTML/en/kmysqladmin/index-2.html
-share/doc/kde/HTML/en/kmysqladmin/index-3.html
-share/doc/kde/HTML/en/kmysqladmin/index-4.html
-share/doc/kde/HTML/en/kmysqladmin/index-5.html
-share/doc/kde/HTML/en/kmysqladmin/index-6.html
-share/doc/kde/HTML/en/kmysqladmin/index-7.html
-share/doc/kde/HTML/en/kmysqladmin/index.html
-share/doc/kde/HTML/en/kmysqladmin/Logo.jpg
-share/doc/kde/HTML/en/kmysqladmin/logotp3.gif
-share/kde/apps/kmysqladmin/kmysqladminui.rc
+share/doc/kde/HTML/en/kmysqladmin/Logo.png
+share/doc/kde/HTML/en/kmysqladmin/common
+share/doc/kde/HTML/en/kmysqladmin/index.cache.bz2
+share/doc/kde/HTML/en/kmysqladmin/index.docbook
+share/doc/kde/HTML/en/kmysqladmin/snapshot1.png
+share/doc/kde/HTML/en/kmysqladmin/snapshot2.png
+share/doc/kde/HTML/en/kmysqladmin/snapshot3.png
+share/doc/kde/HTML/en/kmysqladmin/snapshot4.png
 share/kde/applnk/Applications/kmysqladmin.desktop
-share/kde/icons/locolor/32x32/apps/kmysqladmin.png
+share/kde/apps/kmysqladmin/kmysqladminui.rc
+share/kde/apps/kmysqladmin/toolbar/access_rights.xpm
+share/kde/apps/kmysqladmin/toolbar/altertab.xpm
+share/kde/apps/kmysqladmin/toolbar/connect.xpm
+share/kde/apps/kmysqladmin/toolbar/newdb.xpm
+share/kde/apps/kmysqladmin/toolbar/newtab.xpm
+share/kde/apps/kmysqladmin/toolbar/status.xpm
+share/kde/apps/kmysqladmin/toolbar/threads.xpm
+share/kde/apps/kmysqladmin/toolbar/viewtab.xpm
+share/kde/icons/hicolor/16x16/apps/kmysqladmin.png
+share/kde/icons/hicolor/32x32/apps/kmysqladmin.png
+share/kde/icons/hicolor/48x48/apps/kmysqladmin.png
 share/kde/icons/locolor/16x16/apps/kmysqladmin.png
-share/kde/locale/de/LC_MESSAGES/kmysqladmin.mo
-@unexec ${RMDIR} %D/share/kde/locale/de/LC_MESSAGES 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/kde/locale/de 2>/dev/null || ${TRUE}
+share/kde/icons/locolor/32x32/apps/kmysqladmin.png
+${PKGLOCALEDIR}/locale/de/LC_MESSAGES/kmysqladmin.mo
+${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/kmysqladmin.mo
+@comment in kde: @dirrm share/kde/icons/locolor/32x32/apps
+@comment in kde: @dirrm share/kde/icons/locolor/16x16/apps
+@comment in kde: @dirrm share/kde/icons/hicolor/48x48/apps
+@comment in kde: @dirrm share/kde/icons/hicolor/32x32/apps
+@comment in kde: @dirrm share/kde/icons/hicolor/16x16/apps
+@dirrm share/kde/apps/kmysqladmin/toolbar
 @dirrm share/kde/apps/kmysqladmin
+@comment in kde: @dirrm share/kde/apps
+@comment in kde: @dirrm share/kde/applnk/Applications
 @dirrm share/doc/kde/HTML/en/kmysqladmin
+@comment in kde: @dirrm share/doc/kde/HTML/en
diff --git a/databases/kmysqladmin/distinfo b/databases/kmysqladmin/distinfo
index 8d734ca0bf9..7a97646d22a 100644
--- a/databases/kmysqladmin/distinfo
+++ b/databases/kmysqladmin/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.3 2002/08/19 11:23:14 agc Exp $
+$NetBSD: distinfo,v 1.4 2004/12/27 23:35:01 markd Exp $
 
-SHA1 (kmysqladmin-0.5.1.tar.gz) = d6c8d2985b1943ae2f589f1959d6ec3d400ad6a5
-Size (kmysqladmin-0.5.1.tar.gz) = 521617 bytes
-SHA1 (patch-aa) = c2f5058a20e4923b901934ebb691959440a19902
-SHA1 (patch-ab) = 9b713950505f50043c3ea1e9fd62191c95b0340a
-SHA1 (patch-ac) = 7ed9c8601f60fee0768ea05971fd76e207f118f9
-SHA1 (patch-ad) = 957c2e7298490c4b4d689df5b8b63b0955484bec
+SHA1 (kmysqladmin-0.7.0.tar.gz) = b01cb4a19669a11eb22c9f2a0ed44c6891734987
+Size (kmysqladmin-0.7.0.tar.gz) = 1315939 bytes
+SHA1 (patch-aa) = e3327d1992f70534b20af4be5e9698038dff13e1
+SHA1 (patch-ab) = d7fd4b73cecbe03c20efbdf89981738cc6fa7c19
+SHA1 (patch-ac) = 284e490aa24eeaacb80f2df1c3da1ab32594de20
diff --git a/databases/kmysqladmin/patches/patch-aa b/databases/kmysqladmin/patches/patch-aa
index e498eb1bbed..faf2cc24ada 100644
--- a/databases/kmysqladmin/patches/patch-aa
+++ b/databases/kmysqladmin/patches/patch-aa
@@ -1,13 +1,28 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/08/01 08:20:45 skrll Exp $
+$NetBSD: patch-aa,v 1.2 2004/12/27 23:35:01 markd Exp $
 
---- configure.orig	Thu Jul  5 16:24:43 2001
-+++ configure	Thu Jul  5 16:25:45 2001
-@@ -5796,7 +5796,7 @@
- fi
+--- kmysqladmin/setup/settings.cpp.orig	2004-12-28 12:06:21.000000000 +1300
++++ kmysqladmin/setup/settings.cpp
+@@ -151,7 +151,7 @@ KWallet::Wallet*CSettings::openWallet(co
+             delete myWall; return 0;
+         }
+     }
+-    myWall->setFolder(aDir);
++    myWall->setFolder(aDir.c_str());
+     return myWall;
+ }
  
- 	mysql_include_found=""
--	if test -n "$mysq_use_include" && \
-+	if test -n "$mysql_use_include" && \
- 	test "$mysql_use_include" != "NONE"; then
- 	    mysql_include_found="Setting to $mysql_use_include"
- 	else
+@@ -169,10 +169,10 @@ void CSettings::SaveLastLogin(const std:
+         return;
+     }
+     QMap<QString,QString> login_values;
+-    login_values[_USER]=user;
+-    login_values[_HOST]=host;
+-    login_values[_PORT]=port;
+-    login_values[_PASS]=pass;
++    login_values[_USER]=user.c_str();
++    login_values[_HOST]=host.c_str();
++    login_values[_PORT]=port.c_str();
++    login_values[_PASS]=pass.c_str();
+     myWall->writeMap(_LAST_LOGIN_MAP,login_values);
+     delete myWall;
+ #endif
diff --git a/databases/kmysqladmin/patches/patch-ab b/databases/kmysqladmin/patches/patch-ab
index 901a8fec1a4..11e8aed1651 100644
--- a/databases/kmysqladmin/patches/patch-ab
+++ b/databases/kmysqladmin/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.1.1.1 2001/08/01 08:20:45 skrll Exp $
+$NetBSD: patch-ab,v 1.2 2004/12/27 23:35:01 markd Exp $
 
---- acinclude.m4.orig	Thu Jul  5 16:28:05 2001
-+++ acinclude.m4	Thu Jul  5 16:28:24 2001
-@@ -1436,7 +1436,7 @@
-     AC_MSG_CHECKING([for mysql includes])
-     AC_ARG_WITH(mysql-includes, [  --with-mysql-include     where the mysql.h is located],mysql_use_include="$withval",mysql_use_include=NONE)
- 	mysql_include_found=""
--	if test -n "$mysq_use_include" && \
-+	if test -n "$mysql_use_include" && \
- 	test "$mysql_use_include" != "NONE"; then
- 	    mysql_include_found="Setting to $mysql_use_include"
- 	else
+--- kmysqladmin/frontend/browsetable/tableview.cpp.orig	2004-12-28 12:13:38.000000000 +1300
++++ kmysqladmin/frontend/browsetable/tableview.cpp
+@@ -786,7 +786,7 @@ void CTableView::saveHtml(const char*fil
+                         bimagesaved = true;
+                     }
+                 } else {
+-                    iname = QString("%1_%2.jpg").arg(desc->get_name()).arg(number);
++                    iname = QString("%1_%2.jpg").arg(desc->get_name().c_str()).arg(number);
+                     bImage.save(inf.dirPath(true)+"/"+iname,"JPEG");
+                 }
+                 st << iname << "\">\n";
diff --git a/databases/kmysqladmin/patches/patch-ac b/databases/kmysqladmin/patches/patch-ac
index 957b1c365e2..82dba01dd0e 100644
--- a/databases/kmysqladmin/patches/patch-ac
+++ b/databases/kmysqladmin/patches/patch-ac
@@ -1,13 +1,19 @@
-$NetBSD: patch-ac,v 1.1.1.1 2001/08/01 08:20:45 skrll Exp $
+$NetBSD: patch-ac,v 1.2 2004/12/27 23:35:01 markd Exp $
 
---- aclocal.m4.orig	Thu Jul  5 16:28:14 2001
-+++ aclocal.m4	Thu Jul  5 16:28:52 2001
-@@ -1447,7 +1447,7 @@
-     AC_MSG_CHECKING([for mysql includes])
-     AC_ARG_WITH(mysql-includes, [  --with-mysql-include     where the mysql.h is located],mysql_use_include="$withval",mysql_use_include=NONE)
- 	mysql_include_found=""
--	if test -n "$mysq_use_include" && \
-+	if test -n "$mysql_use_include" && \
- 	test "$mysql_use_include" != "NONE"; then
- 	    mysql_include_found="Setting to $mysql_use_include"
- 	else
+--- kmysqladmin/MainWindow.cpp.orig	2004-12-28 12:18:13.000000000 +1300
++++ kmysqladmin/MainWindow.cpp
+@@ -285,10 +285,10 @@ void CMainWindow::ConnectQuick(const QSt
+ {
+     if (which.length()==0) return;
+     QMap<QString,QString> qvals = GlobalSettings.getConnectProfile(which);
+-    _connect(qvals[Settings_defines::_PROFILES_user],
+-        qvals[Settings_defines::_PROFILES_host],
+-        qvals[Settings_defines::_PROFILES_port],
+-        qvals[Settings_defines::_PROFILES_pass]);
++    _connect(qvals[Settings_defines::_PROFILES_user].latin1(),
++        QT_TO_STL_STRING(qvals[Settings_defines::_PROFILES_host]),
++        QT_TO_STL_STRING(qvals[Settings_defines::_PROFILES_port]),
++        QT_TO_STL_STRING(qvals[Settings_defines::_PROFILES_pass]));
+ }
+ 
+ void CMainWindow::_connect(const std::string&user,const std::string&host,
diff --git a/databases/kmysqladmin/patches/patch-ad b/databases/kmysqladmin/patches/patch-ad
deleted file mode 100644
index 16d88a613eb..00000000000
--- a/databases/kmysqladmin/patches/patch-ad
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2002/08/19 11:23:15 agc Exp $
-
---- kmysqladmin/profile.cpp.orig	Thu Jul  5 16:46:07 2001
-+++ kmysqladmin/profile.cpp	Thu Jul  5 16:48:47 2001
-@@ -33,7 +33,13 @@
- #include <sys/stat.h>
- #else
- #include <iostream>
-+#ifdef __NetBSD__
-+#include <strstream>
-+#include <sys/stat.h>
-+#include <unistd.h>
-+#else
- #include <istream>
-+#endif
- #endif
- 
- #include "helpers.h"