Update to mysqlcc 1.0.2. Fixes building with modern MySQL / MariaDB.
OK?
Index: Makefile
===================================================================
RCS file: /home/cvs/ports/databases/mysqlcc/Makefile,v
retrieving revision 1.20
diff -u -p -u -p -r1.20 Makefile
--- Makefile 13 Sep 2014 18:09:20 -0000 1.20
+++ Makefile 15 Sep 2014 13:28:11 -0000
@@ -2,10 +2,9 @@
COMMENT= GUI client for MySQL
-VERSION= 0.9.8
+VERSION= 1.0.2
DISTNAME= mysqlcc-${VERSION}-src
PKGNAME= mysqlcc-${VERSION}
-REVISION= 6
CATEGORIES= databases
HOMEPAGE= http://mysqlcc.sourceforge.net/
Index: distinfo
===================================================================
RCS file: /home/cvs/ports/databases/mysqlcc/distinfo,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 distinfo
--- distinfo 8 Sep 2008 07:48:43 -0000 1.4
+++ distinfo 15 Sep 2014 13:16:59 -0000
@@ -1,5 +1,2 @@
-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
+SHA256 (mysqlcc-1.0.2-src.tar.gz) =
ApJV/imDe9MZ65bHjeiA5R2vTvM6+BcyW/In0IkmLx0=
+SIZE (mysqlcc-1.0.2-src.tar.gz) = 6673848
Index: patches/patch-configure
===================================================================
RCS file: /home/cvs/ports/databases/mysqlcc/patches/patch-configure,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-configure
--- patches/patch-configure 8 Sep 2008 07:48:43 -0000 1.2
+++ patches/patch-configure 15 Sep 2014 15:47:25 -0000
@@ -1,6 +1,6 @@
$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
+--- configure.orig Sun Oct 8 16:40:01 2006
++++ configure Mon Sep 15 11:47:13 2014
@@ -2457,9 +2457,9 @@ echo "${ECHO_T}" >&6
for dir in $mysql_lib; do
if test "x$mysql_found" != "xyes"
@@ -32,77 +32,7 @@ $OpenBSD: patch-configure,v 1.2 2008/09/
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
-@@ -3090,51 +3090,7 @@ fi
-
- if test "x$mysql_found" = "xyes"
- then
-- echo "$as_me:$LINENO: checking \"if MySQL Version $dir is
>= 4.0.0\"" >&5
--echo $ECHO_N "checking \"if MySQL Version $dir is >= 4.0.0\"... $ECHO_C" >&6
-- CPPFLAGS="$CPPFLAGS -I$dir"
-- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
--#include "confdefs.h"
--
-- #include <mysql_version.h>
-- #if MYSQL_VERSION_ID < 40000
-- #error
-- #endif
--
--_ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-- ac_status=$?
-- egrep -v '^ *\+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } >/dev/null; then
-- if test -s conftest.err; then
-- ac_cpp_err=$ac_c_preproc_warn_flag
-- else
-- ac_cpp_err=
-- fi
--else
-- ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
-- mysql_version_ok=yes
--else
-- echo "$as_me: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-- mysql_version_ok=no
--fi
--rm -f conftest.err conftest.$ac_ext
--
-- if test "x$mysql_version_ok" != "xno"
-- then
-- MYSQL_INCLUDE="$dir"
--
-- fi
-- echo "$as_me:$LINENO: result: $mysql_version_ok" >&5
--echo "${ECHO_T}$mysql_version_ok" >&6
-+ MYSQL_INCLUDE="$dir"
- fi
- fi
- done
-@@ -3146,16 +3102,8 @@ echo "$as_me: error: Could not find mysql.h in '$mysql
- { (exit 1); exit 1; }; }
- fi
-
-- if test "x$mysql_version_ok" != "xyes"
-- then
-- echo "Please upgrade your MySQL installation to version 4.0.0 or
higher"
-- echo "If you do have the correct version of MySQL installed
somewhere"
-- echo "other than $dir, please specify it as --with-mysql-include=
argument"
-- exit 1
-- fi
-
-
--
- # Check whether --with-qt or --without-qt was given.
- if test "${with_qt+set}" = set; then
- withval="$with_qt"
-@@ -3184,7 +3132,7 @@ fi
+@@ -3184,7 +3184,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
@@ -111,7 +41,7 @@ $OpenBSD: patch-configure,v 1.2 2008/09/
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
#include "confdefs.h"
-@@ -4078,7 +4026,7 @@ else
+@@ -4078,7 +4078,7 @@ else
fi
echo "Creating Makefile with qmake"
Index: patches/patch-mysqlcc_pro_in
===================================================================
RCS file: /home/cvs/ports/databases/mysqlcc/patches/patch-mysqlcc_pro_in,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-mysqlcc_pro_in
--- patches/patch-mysqlcc_pro_in 19 Jul 2004 13:56:20 -0000 1.1.1.1
+++ patches/patch-mysqlcc_pro_in 15 Sep 2014 15:51:51 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-mysqlcc_pro_in,v 1.1.1.1 2004/07/19 13:56:20 wilfried Exp $
---- mysqlcc.pro.in.orig 2003-12-14 00:10:43.000000000 +0100
-+++ mysqlcc.pro.in 2003-12-26 14:10:30.000000000 +0100
+--- mysqlcc.pro.in.orig Fri Aug 11 16:29:36 2006
++++ mysqlcc.pro.in Mon Sep 15 11:51:45 2014
@@ -1,5 +1,5 @@
TEMPLATE = app
-CONFIG += qt thread
@@ -8,12 +8,14 @@ $OpenBSD: patch-mysqlcc_pro_in,v 1.1.1.1
DEFINES += QT_DLL
DEFINES += HAVE_MYSQLCC_CONFIG
TARGET = mysqlcc
-@@ -27,7 +27,7 @@ win32 {
+@@ -27,8 +27,8 @@ win32 {
}
unix {
- LIBS += @MYSQL_LIB@
+- INCLUDEPATH += @MYSQL_INCLUDE@
+ LIBS += @MYSQL_LIB@ -lz
- INCLUDEPATH += @MYSQL_INCLUDE@
++ INCLUDEPATH += @MYSQL_INCLUDE@ @MYSQL_INCLUDE@/private
CONFIG += x11
OBJECTS_DIR = tmp
+ }
Index: patches/patch-src_main_cpp
===================================================================
RCS file: patches/patch-src_main_cpp
diff -N patches/patch-src_main_cpp
--- patches/patch-src_main_cpp 8 Sep 2008 07:48:43 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,40 +0,0 @@
-$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
- #include <m_string.h>
-+#if MYSQL_VERSION_ID >= 40000
- #include <my_getopt.h>
-+#endif
- #ifndef NO_QT
- #define NO_QT
- #endif
-@@ -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;
-
-+#if MYSQL_VERSION_ID >= 40000
- static struct my_option my_long_options[] =
- {
- {"compress", 'C', "Use compression in server/client protocol.", 0, 0, 0,
GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
-@@ -185,6 +188,7 @@ static void usage()
- my_print_variables(my_long_options);
- exit(-1);
- }
-+#endif
-
-
- int main(int argc, char *argv[])
-@@ -196,8 +200,10 @@ int main(int argc, char *argv[])
- load_defaults("my",load_default_groups,&argc,&argv);
- save_argv = argv;
- progname= argv[0];
-+#if MYSQL_VERSION_ID >= 40000
- if (handle_options(&argc, &argv, my_long_options, get_one_option))
- exit(-1);
-+#endif
- if (!argv[0] || !argv[1] || (pid = atoi(argv[0])) <= 0 || (t=
atoi(argv[1])) <= 0)
- ret = mysqlcc_main(argc, argv);
- free_defaults(save_argv);
--
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.
