cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to 0.9.8

Browse Source
This commit is contained in:
wilfried 2008-09-08 07:48:43 +00:00
parent 7b53edb335
commit 323e546844
9 changed files with 64 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
databases/mysqlcc/Makefile
View File

@ -1,13 +1,13 @@
# $OpenBSD: Makefile,v 1.7 2007/09/15 20:34:00 simon Exp $
# $OpenBSD: Makefile,v 1.8 2008/09/08 07:48:43 wilfried Exp $
COMMENT= GUI client for MySQL
VERSION= 0.9.4
VERSION= 0.9.8
DISTNAME= mysqlcc-${VERSION}-src
PKGNAME= mysqlcc-${VERSION}p2
PKGNAME= mysqlcc-${VERSION}
CATEGORIES= databases
HOMEPAGE= http://mysql.com/products/mysqlcc/index.html
HOMEPAGE= http://mysqlcc.sourceforge.net/
MAINTAINER= Peter Stromberg <wilfried@openbsd.org>
@ -18,10 +18,7 @@ PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= X11 Xext c m pthread stdc++ z
MASTER_SITES= ftp://ftp.sunet.se/pub/unix/databases/relational/mysql/Downloads/MySQLCC/ \
ftp://sunsite.dk/mirrors/mysql/Downloads/MySQLCC/ \
ftp://gd.tuwien.ac.at/db/mysql/Downloads/MySQLCC/ \
ftp://mysql.secsup.org/pub/software/mysql/Downloads/MySQLCC
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mysqlcc/}
MODQT_MT= Yes
MODULES= x11/qt3

10
databases/mysqlcc/distinfo
View File

@ -1,5 +1,5 @@
MD5 (mysqlcc-0.9.4-src.tar.gz) = Ju41KNzmkLIn2L+3G0auZg==
RMD160 (mysqlcc-0.9.4-src.tar.gz) = 4mMhIdzYmfDwCej5J0aXSoAJ9qY=
SHA1 (mysqlcc-0.9.4-src.tar.gz) = aQqaj0rWvfM2c+ktEBaw5LjOoDA=
SHA256 (mysqlcc-0.9.4-src.tar.gz) = uxxrKnxKSzjZyT15TpGqv4D4Gppkc5WEcJ2gDyKKe2Y=
SIZE (mysqlcc-0.9.4-src.tar.gz) = 747244
MD5 (mysqlcc-0.9.8-src.tar.gz) = yZE3hOmnAMbpoUb/6hmS0A==
RMD160 (mysqlcc-0.9.8-src.tar.gz) = YPxn4hcE+xNdq3JlLE1zb3ld38c=
SHA1 (mysqlcc-0.9.8-src.tar.gz) = 2Fuf1ICi6O7wGsYtYmQsA3W+nqA=
SHA256 (mysqlcc-0.9.8-src.tar.gz) = KiBAfuI2mjOEA9gQBsbiVq6uvEMGbUPNLmjxqGlLxS0=
SIZE (mysqlcc-0.9.8-src.tar.gz) = 1529243

48
databases/mysqlcc/patches/patch-configure
View File

@ -1,16 +1,38 @@
$OpenBSD: patch-configure,v 1.1.1.1 2004/07/19 13:56:20 wilfried Exp $
--- configure.orig Fri Mar 28 23:06:00 2003
+++ configure Tue Apr 1 15:30:59 2003
@@ -2480,7 +2480,7 @@ fi
$OpenBSD: patch-configure,v 1.2 2008/09/08 07:48:43 wilfried Exp $
--- configure.orig Sun Oct 8 22:40:01 2006
+++ configure Thu Aug 21 13:39:50 2008
@@ -2457,9 +2457,9 @@ echo "${ECHO_T}" >&6
for dir in $mysql_lib; do
if test "x$mysql_found" != "xyes"
then
- as_ac_File=`echo "ac_cv_file_"$dir/libmysqlclient.so"" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for \"$dir/libmysqlclient.so\"" >&5
-echo $ECHO_N "checking for \"$dir/libmysqlclient.so\"... $ECHO_C" >&6
+ as_ac_File=`echo "ac_cv_file_"$dir/libmysqlclient.a"" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for \"$dir/libmysqlclient.a\"" >&5
+echo $ECHO_N "checking for \"$dir/libmysqlclient.a\"... $ECHO_C" >&6
if eval "test \"\${$as_ac_File+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -2467,7 +2467,7 @@ else
{ { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
{ (exit 1); exit 1; }; }
-if test -r ""$dir/libmysqlclient.so""; then
+if test -r ""$dir/libmysqlclient.a""; then
eval "$as_ac_File=yes"
else
eval "$as_ac_File=no"
@@ -2484,7 +2484,7 @@ fi
if test "x$mysql_found" = "xyes"
then
LIBS="-L$dir $SAVE_LIBS $LIBZ_LIB"
- MYSQL_LIB="$dir/libmysqlclient.a $LIBZ_LIB"
- MYSQL_LIB="$dir/libmysqlclient.so $LIBZ_LIB"
+ MYSQL_LIB="-lmysqlclient $LIBZ_LIB"
echo "$as_me:$LINENO: checking for mysql_real_connect in -lmysqlclient" >&5
echo $ECHO_N "checking for mysql_real_connect in -lmysqlclient... $ECHO_C" >&6
@@ -3086,51 +3086,7 @@ fi
@@ -3090,51 +3090,7 @@ fi
if test "x$mysql_found" = "xyes"
then
@ -63,7 +85,7 @@ $OpenBSD: patch-configure,v 1.1.1.1 2004/07/19 13:56:20 wilfried Exp $
fi
fi
done
@@ -3142,14 +3098,6 @@ echo "$as_me: error: Could not find mysq
@@ -3146,16 +3102,8 @@ echo "$as_me: error: Could not find mysql.h in '$mysql
{ (exit 1); exit 1; }; }
fi
@ -74,11 +96,13 @@ $OpenBSD: patch-configure,v 1.1.1.1 2004/07/19 13:56:20 wilfried Exp $
- echo "other than $dir, please specify it as --with-mysql-include= argument"
- exit 1
- fi
-
# Check whether --with-qt or --without-qt was given.
@@ -3179,7 +3127,7 @@ fi
if test "${with_qt+set}" = set; then
withval="$with_qt"
@@ -3184,7 +3132,7 @@ fi
echo "$as_me:$LINENO: checking \"if Qt Version in $QTDIR is >= 3.0.5\"" >&5
echo $ECHO_N "checking \"if Qt Version in $QTDIR is >= 3.0.5\"... $ECHO_C" >&6
@ -87,9 +111,9 @@ $OpenBSD: patch-configure,v 1.1.1.1 2004/07/19 13:56:20 wilfried Exp $
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
#include "confdefs.h"
@@ -4067,7 +4015,7 @@ fi
@@ -4078,7 +4026,7 @@ else
fi
QMAKESPEC=$QTDIR/mkspecs/$host_os
echo "Creating Makefile with qmake"
-QMAKESPEC=$QMAKESPEC QTDIR=$QTDIR $QTDIR/bin/qmake mysqlcc.pro
+QMAKESPEC=$FILESDIR QTDIR=$QTDIR $QTDIR/bin/qmake-mt mysqlcc.pro

15
databases/mysqlcc/patches/patch-shared_src_CMySQL_cpp
View File

@ -1,15 +0,0 @@
$OpenBSD: patch-shared_src_CMySQL_cpp,v 1.2 2005/09/07 13:58:35 wilfried Exp $
--- shared/src/CMySQL.cpp.orig Tue Sep 6 19:18:47 2005
+++ shared/src/CMySQL.cpp Tue Sep 6 19:20:24 2005
@@ -451,7 +451,11 @@ bool CMySQL::mysqlShutdown()
if (!isConnected())
return false;
+#if ( MYSQL_VERSION_ID >= 40103 && MYSQL_VERSION_ID != 50000 )
+ if (mysql_shutdown(mysql,SHUTDOWN_DEFAULT) != 0)
+#else
if (mysql_shutdown(mysql) != 0)
+#endif
{
if (emiterror)
emitError();

14
databases/mysqlcc/patches/patch-src_CApplication_cpp
View File

@ -1,12 +1,12 @@
$OpenBSD: patch-src_CApplication_cpp,v 1.1.1.1 2004/07/19 13:56:20 wilfried Exp $
--- src/CApplication.cpp.orig 2003-12-14 00:10:43.000000000 +0100
+++ src/CApplication.cpp 2003-12-26 14:12:03.000000000 +0100
@@ -109,7 +109,7 @@ void CApplication::initGlobals(bool star
mydir += "/";
$OpenBSD: patch-src_CApplication_cpp,v 1.2 2008/09/08 07:48:43 wilfried Exp $
--- src/CApplication.cpp.orig Fri Aug 11 22:29:12 2006
+++ src/CApplication.cpp Thu Aug 21 13:30:52 2008
@@ -110,7 +110,7 @@ void CApplication::initGlobals(bool startup)
#else
//Directory where mysqlcc.exe (or mysqlcc) is.
- QString mydir = QDir::currentDirPath() + "/";
//QString mydir = QDir::currentDirPath() + "/";
- QString mydir = "/usr/share/mysqlcc/"; // This needs to be done with a PREFIX define ..
+ QString mydir = LOCALBASE "/share/mysqlcc/";
//QString mydir = "/usr/share/mysqlcc/"; This needs to be done with a PREFIX define ..
#endif
//Translations path

10
databases/mysqlcc/patches/patch-src_CHotKeyEditorDialog_cpp
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_CHotKeyEditorDialog_cpp,v 1.1.1.1 2004/07/19 13:56:20 wilfried Exp $
--- src/CHotKeyEditorDialog.cpp.orig Sat Nov 2 14:47:25 2002
+++ src/CHotKeyEditorDialog.cpp Tue Nov 5 16:39:57 2002
@@ -91,6 +91,7 @@ This class takes care of displaying the
$OpenBSD: patch-src_CHotKeyEditorDialog_cpp,v 1.2 2008/09/08 07:48:43 wilfried Exp $
--- src/CHotKeyEditorDialog.cpp.orig Fri Aug 11 22:29:13 2006
+++ src/CHotKeyEditorDialog.cpp Thu Aug 21 13:27:40 2008
@@ -91,6 +91,7 @@ This class takes care of displaying the hotkey menu an
CHotKeyEditorMenu::CHotKeyEditorMenu(QWidget * parent, QMenuBar *menuBar, const char * name)
:QPopupMenu(parent, name)
{
@ -9,7 +9,7 @@ $OpenBSD: patch-src_CHotKeyEditorDialog_cpp,v 1.1.1.1 2004/07/19 13:56:20 wilfri
#ifdef DEBUG
qDebug("CHotKeyEditorMenu::CHotKeyEditorMenu()");
#endif
@@ -100,6 +101,7 @@ CHotKeyEditorMenu::CHotKeyEditorMenu(QWi
@@ -100,6 +101,7 @@ CHotKeyEditorMenu::CHotKeyEditorMenu(QWidget * parent,
connect(hotKeyEditorAction, SIGNAL(activated()), this, SLOT(openHotKeyEditor()));
hotKeyEditorAction->addTo(this);
menuBar->insertItem(tr("Hot&Keys"), this);

25
databases/mysqlcc/patches/patch-src_CQueryWindow_cpp
View File

@ -1,25 +0,0 @@
$OpenBSD: patch-src_CQueryWindow_cpp,v 1.1 2006/07/24 09:18:13 bernd Exp $
Let mysqlcc work with mysql5. See: http://lists.mysql.com/gui-tools/1842
--- src/CQueryWindow.cpp.orig Sun Dec 14 00:10:44 2003
+++ src/CQueryWindow.cpp Tue Jul 18 13:31:58 2006
@@ -467,8 +467,16 @@ bool CQuerySet::execQuery(const QString
if (explain_rows == 1)
{
explain_query->next(true);
- default_table = explain_query->row(mysql()->mysql()->version().major >= 4 &&
- mysql()->mysql()->version().minor >= 1 ? 2 : 0);
+
+ if (mysql()->mysql()->version().major >= 5 ||
+ (mysql()->mysql()->version().major == 4 &&
+ mysql()->mysql()->version().minor >= 1))
+ {
+ default_table = explain_query->row(2);
+ }
+ else
+ default_table = explain_query->row(0);
+
if (!default_table.isEmpty())
{
finished_evt->read_only = default_database.isEmpty() ||

8
databases/mysqlcc/patches/patch-src_main_cpp
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_main_cpp,v 1.1.1.1 2004/07/19 13:56:20 wilfried Exp $
--- src/main.cpp.orig 2003-12-14 00:10:44.000000000 +0100
+++ src/main.cpp 2003-12-26 14:10:30.000000000 +0100
$OpenBSD: patch-src_main_cpp,v 1.2 2008/09/08 07:48:43 wilfried Exp $
--- src/main.cpp.orig Fri Aug 11 22:29:12 2006
+++ src/main.cpp Thu Aug 21 13:27:40 2008
@@ -22,7 +22,9 @@
#undef VERSION
#endif
@ -11,7 +11,7 @@ $OpenBSD: patch-src_main_cpp,v 1.1.1.1 2004/07/19 13:56:20 wilfried Exp $
#ifndef NO_QT
#define NO_QT
#endif
@@ -44,6 +46,7 @@ static const char *load_default_groups[]
@@ -44,6 +46,7 @@ static const char *load_default_groups[]= { "mysqlcc",
static ulong select_limit,my_net_buffer_length,max_join_size,my_max_allowed_packet,opt_connect_timeout=0;
static uint opt_local_infile=0;

4
databases/mysqlcc/pkg/PLIST
View File

@ -1,6 +1,6 @@
@comment $OpenBSD: PLIST,v 1.2 2004/09/18 10:39:08 espie Exp $
@comment $OpenBSD: PLIST,v 1.3 2008/09/08 07:48:43 wilfried Exp $
@conflict MyCC-*
bin/mysqlcc
@bin bin/mysqlcc
share/mysqlcc/
share/mysqlcc/error.wav
share/mysqlcc/syntax.txt