Update mysqlcc to 1.0.2.

No changelog, but at least, buildable with recent MySQL.

while here:
* removed OpenSSL related stuffs, no reason is found.
* set LICENSE=gnu-gpl-v2 (or later).
* drop needless definitions.

6 files changed, 21 insertions, 96 deletions

diff --git a/databases/mysqlcc/Makefile b/databases/mysqlcc/Makefile
index 6bf90595668..9b642db99ba 100644
--- a/databases/mysqlcc/Makefile
+++ b/databases/mysqlcc/Makefile
@@ -1,27 +1,22 @@
-# $NetBSD: Makefile,v 1.42 2013/09/13 12:29:19 obache Exp $
+# $NetBSD: Makefile,v 1.43 2013/09/17 11:35:47 obache Exp $
 #
 
-DISTNAME=		mysqlcc-0.9.8-src
+DISTNAME=		mysqlcc-1.0.2-src
 PKGNAME=		${DISTNAME:S/-src//}
-PKGREVISION=		13
 CATEGORIES=		databases
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=mysqlcc/}
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://mysqlcc.sourceforge.net/
 COMMENT=		MySQL Control Center
+LICENSE=		gnu-gpl-v2
 
 USE_LANGUAGES=		c c++
-USE_PKGLOCALEDIR=	YES
-USE_TOOLS+=		autoconf automake
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	\
-	--with-mysql-lib=${BUILDLINK_PREFIX.mysql-client}/lib/mysql
+	--with-mysql-lib=${BUILDLINK_PREFIX.mysql-client}/${BUILDLINK_LIBDIRS.mysql-client}
 CONFIGURE_ARGS+=	\
-	--with-mysql-include=${BUILDLINK_PREFIX.mysql-client}/include/mysql
-CONFIGURE_ARGS+=	--with-openssl-includes=${SSLBASE}/include
-CONFIGURE_ARGS+=	--with-openssl-lib=${SSLBASE}/lib
-CONFIGURE_ENV+=		QMAKESPEC="${QTDIR}/mkspecs/netbsd-g++"
+	--with-mysql-include=${BUILDLINK_PREFIX.mysql-client}/${BUILDLINK_INCDIRS.mysql-client}
 
 SUBST_CLASSES+=		paths
 SUBST_STAGE.paths=	pre-configure
@@ -29,14 +24,9 @@ SUBST_FILES.paths=	src/CApplication.cpp
 SUBST_SED.paths=	-e "s|@PREFIX@|${PREFIX}|"
 SUBST_MESSAGE.paths=	Fixing paths.
 
-BROKEN=		"MySQL 5.1 and later API is not supported"
-
 INSTALLATION_DIRS=	bin share/mysqlcc/translations
 SUPPORT_FILES=		error.wav information.wav syntax.txt warning.wav
 
-pre-configure:
-	cd ${WRKSRC} && aclocal && autoconf
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/mysqlcc ${DESTDIR}${PREFIX}/bin
 .for f in ${SUPPORT_FILES}
@@ -47,7 +37,6 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/translations/*.ts \
 		${DESTDIR}${PREFIX}/share/mysqlcc/translations
 
-.include "../../security/openssl/buildlink3.mk"
 .include "../../x11/qt3-tools/buildlink3.mk"
 .include "../../mk/mysql.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/mysqlcc/distinfo b/databases/mysqlcc/distinfo
index c9f866a3e0d..bcdc780a671 100644
--- a/databases/mysqlcc/distinfo
+++ b/databases/mysqlcc/distinfo
@@ -1,10 +1,7 @@
-$NetBSD: distinfo,v 1.4 2010/03/05 13:50:03 taca Exp $
+$NetBSD: distinfo,v 1.5 2013/09/17 11:35:47 obache Exp $
 
-SHA1 (mysqlcc-0.9.8-src.tar.gz) = d85b9fd480a2e8eef01ac62d62642c0375be9ea0
-RMD160 (mysqlcc-0.9.8-src.tar.gz) = 60fc67e21704fb135dab72652c4d736f795ddfc7
-Size (mysqlcc-0.9.8-src.tar.gz) = 1529243 bytes
-SHA1 (patch-aa) = fbb012582b1df2a34572332dc6e682377101d605
-SHA1 (patch-ab) = 9b2540c2eee1d0665a83da360d75bd488510a84b
-SHA1 (patch-ac) = 5978ef78fa5d941370ae779de259757f1e50c9a8
+SHA1 (mysqlcc-1.0.2-src.tar.gz) = 8f4846c3d64078eae433784b4d69dd355e45ade9
+RMD160 (mysqlcc-1.0.2-src.tar.gz) = ebfcdabd1791b021df8b88c3874e5a8d413bf1b5
+Size (mysqlcc-1.0.2-src.tar.gz) = 6673848 bytes
 SHA1 (patch-ae) = 1ca050f7bbd65ef5911a32283fd832741942f623
-SHA1 (patch-af) = 98a5b36f295ccaf8c2f8410d56a3837b94cae091
+SHA1 (patch-af) = 2aa7b24355df675e1f116cad23ed1830551696fd
diff --git a/databases/mysqlcc/patches/patch-aa b/databases/mysqlcc/patches/patch-aa
deleted file mode 100644
index 8873328961e..00000000000
--- a/databases/mysqlcc/patches/patch-aa
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/12/21 07:58:31 martti Exp $
-
---- acinclude.m4.orig	2003-12-13 23:10:43.000000000 +0000
-+++ acinclude.m4	2003-12-20 18:24:25.000000000 +0000
-@@ -1 +1,39 @@
-+AC_DEFUN(AC_LIB_OPENSSL, [
-+    AC_ARG_WITH(openssl-lib,
-+    [  --with-openssl-lib=DIR    Look for OpenSSL client library in DIR],
-+    openssl_lib=$withval, openssl_lib="")
-+
-+        AC_MSG_CHECKING([for libssl])
-+        AC_MSG_RESULT()
-+
-+        ssl_ok=no
-+
-+        SAVE_LIBS=$LIBS
-+    
-+        ssl_lib="$openssl_lib /usr/lib  \
-+                   /usr/local/lib"
-+    
-+        for dir in $ssl_lib; do
-+            if test "x$ssl_found" != "xyes"
-+            then
-+                AC_CHECK_FILE("$dir/libssl.a",
-+                              ssl_found=yes, ssl_found=no)
-+                if test "x$ssl_found" = "xyes"
-+                then
-+                    LIBS="$SAVE_LIBS -L$dir -lcrypto -lssl"
-+                    OPENSSL_LIB="$dir/libssl.a $dir/libcrypto.a"
-+                    AC_SUBST(OPENSSL_LIB)
-+                    AC_CHECK_LIB(ssl, SSL_library_init,
-+                                 ssl_ok=yes, ssl_ok=no)
-+		    
-+                fi
-+            fi
-+        done
-+
-+        if test "x$ssl_ok" != "xyes"
-+        then
-+            AC_MSG_ERROR([Could not find libssl in '$ssl_lib'])
-+        fi
-+])
-+
- AC_DEFUN(AC_LIB_MYSQL, [
diff --git a/databases/mysqlcc/patches/patch-ab b/databases/mysqlcc/patches/patch-ab
deleted file mode 100644
index c5d27e3679c..00000000000
--- a/databases/mysqlcc/patches/patch-ab
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2003/12/21 07:58:31 martti Exp $
-
---- configure.in.orig	2003-12-13 23:10:43.000000000 +0000
-+++ configure.in	2003-12-20 18:24:25.000000000 +0000
-@@ -5,2 +5,3 @@
- AC_LIB_Z
-+AC_LIB_OPENSSL
- AC_LIB_MYSQL
diff --git a/databases/mysqlcc/patches/patch-ac b/databases/mysqlcc/patches/patch-ac
deleted file mode 100644
index 5331cab9ec1..00000000000
--- a/databases/mysqlcc/patches/patch-ac
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2003/12/21 07:58:31 martti Exp $
-
---- mysqlcc.pro.in.orig	2003-12-13 23:10:43.000000000 +0000
-+++ mysqlcc.pro.in	2003-12-20 18:24:25.000000000 +0000
-@@ -29,3 +29,3 @@
- unix {
--      LIBS        += @MYSQL_LIB@ 
-+      LIBS        += @MYSQL_LIB@ @OPENSSL_LIB@
-       INCLUDEPATH += @MYSQL_INCLUDE@
diff --git a/databases/mysqlcc/patches/patch-af b/databases/mysqlcc/patches/patch-af
index f8af0b14e55..3fe12ee7700 100644
--- a/databases/mysqlcc/patches/patch-af
+++ b/databases/mysqlcc/patches/patch-af
@@ -1,24 +1,24 @@
-$NetBSD: patch-af,v 1.1 2010/03/05 13:50:04 taca Exp $
+$NetBSD: patch-af,v 1.2 2013/09/17 11:35:47 obache Exp $
 
 Use proper max value.
 
---- src/main.cpp.orig	2006-08-11 20:29:12.000000000 +0000
+--- src/main.cpp.orig	2013-07-24 13:39:11.000000000 +0000
 +++ src/main.cpp
 @@ -95,7 +95,7 @@ static struct my_option my_long_options[
-    0, 1},
+    0, (void*)1},
  
-   {"select_limit", OPT_SELECT_LIMIT, "", (gptr*) &select_limit,
--   (gptr*) &select_limit, 0, GET_ULONG, REQUIRED_ARG, 1000L, 1, ~0L, 0, 1, 0},
-+   (gptr*) &select_limit, 0, GET_ULONG, REQUIRED_ARG, 1000L, 1, LONG_MAX, 0, 1, 0},
+   {"select_limit", OPT_SELECT_LIMIT, "", (uchar**) &select_limit,
+-   (uchar**) &select_limit, 0, GET_ULONG, REQUIRED_ARG, 1000L, 1, ~0L, 0, 1, 0},
++   (uchar**) &select_limit, 0, GET_ULONG, REQUIRED_ARG, 1000L, 1, LONG_MAX, 0, 1, 0},
    
    {"net_buffer_length", OPT_NET_BUFFER_LENGTH, "",
-    (gptr*) &my_net_buffer_length, (gptr*) &my_net_buffer_length, 0, GET_ULONG,
+    (uchar**) &my_net_buffer_length, (uchar**) &my_net_buffer_length, 0, GET_ULONG,
 @@ -111,7 +111,7 @@ static struct my_option my_long_options[
-    (gptr*) &opt_local_infile, 0, GET_BOOL, OPT_ARG, 0, 0, 0, 0, 0, 0},
+    (uchar**) &opt_local_infile, 0, GET_BOOL, OPT_ARG, 0, 0, 0, 0, 0, 0},
  
-   {"max_join_size", OPT_MAX_JOIN_SIZE, "", (gptr*) &max_join_size,
--   (gptr*) &max_join_size, 0, GET_ULONG, REQUIRED_ARG, 1000000L, 1, ~0L, 0, 1,
-+   (gptr*) &max_join_size, 0, GET_ULONG, REQUIRED_ARG, 1000000L, 1, LONG_MAX, 0, 1,
+   {"max_join_size", OPT_MAX_JOIN_SIZE, "", (uchar**) &max_join_size,
+-   (uchar**) &max_join_size, 0, GET_ULONG, REQUIRED_ARG, 1000000L, 1, ~0L, 0, 1,
++   (uchar**) &max_join_size, 0, GET_ULONG, REQUIRED_ARG, 1000000L, 1, LONG_MAX, 0, 1,
     0},
  
    { 0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}