CVS commit: pkgsrc/databases/mysql51-client

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Thu Feb  1 23:14:55 UTC 2018

Modified Files:
        pkgsrc/databases/mysql51-client: Makefile.common distinfo
Added Files:
        pkgsrc/databases/mysql51-client/patches: patch-client_mysql.cc

Log Message:
mysql51-client: Build fix from upstream and limit to C++03.


To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 pkgsrc/databases/mysql51-client/Makefile.common
cvs rdiff -u -r1.29 -r1.30 pkgsrc/databases/mysql51-client/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/databases/mysql51-client/patches/patch-client_mysql.cc

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/databases/mysql51-client/Makefile.common
diff -u pkgsrc/databases/mysql51-client/Makefile.common:1.36 pkgsrc/databases/mysql51-client/Makefile.common:1.37
--- pkgsrc/databases/mysql51-client/Makefile.common:1.36        Sun Sep  3 08:53:05 2017
+++ pkgsrc/databases/mysql51-client/Makefile.common     Thu Feb  1 23:14:55 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.36 2017/09/03 08:53:05 wiz Exp $
+# $NetBSD: Makefile.common,v 1.37 2018/02/01 23:14:55 jperkin Exp $
 #
 # used by databases/mysql51-client/Makefile
 # used by databases/mysql51-server/Makefile
@@ -102,7 +102,7 @@ CONFIGURE_ENV+=             ac_cv_func_pthread_sets
 CONFIGURE_ENV+=                ac_cv_func_pthread_attr_setschedparam=no
 .endif
 
-USE_LANGUAGES=         c c++
+USE_LANGUAGES=         c c++03
 USE_TOOLS+=            autoconf bash autoheader gmake perl:run
 LDFLAGS+=              ${COMPILER_RPATH_FLAG}${PREFIX}/lib/mysql
 

Index: pkgsrc/databases/mysql51-client/distinfo
diff -u pkgsrc/databases/mysql51-client/distinfo:1.29 pkgsrc/databases/mysql51-client/distinfo:1.30
--- pkgsrc/databases/mysql51-client/distinfo:1.29       Thu Apr 13 13:44:49 2017
+++ pkgsrc/databases/mysql51-client/distinfo    Thu Feb  1 23:14:55 2018
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.29 2017/04/13 13:44:49 mef Exp $
+$NetBSD: distinfo,v 1.30 2018/02/01 23:14:55 jperkin Exp $
 
 SHA1 (mysql-5.1.73.tar.gz) = 6cb1c547dec873a0afda825c83fd8e5a32b9a619
 RMD160 (mysql-5.1.73.tar.gz) = ceee36663abbf135d3ddbebe52ebc537ecba25a6
@@ -28,4 +28,5 @@ SHA1 (patch-av) = b8fb1065d7e71522374a16
 SHA1 (patch-aw) = 50b811871b68506131020750f9af41e6834ec1cb
 SHA1 (patch-ax) = 390debbc31e710f5aa41fda6a8b1134a14a2ff23
 SHA1 (patch-ay) = 0b9c334c1e50c0c341e38d3fb189194de2d05b87
+SHA1 (patch-client_mysql.cc) = 206914bcaac3ecb67968f27260a69634edc2e788
 SHA1 (patch-vio_viossl.c) = ad922587684a635a82c2fa662be7431c63063909

Added files:

Index: pkgsrc/databases/mysql51-client/patches/patch-client_mysql.cc
diff -u /dev/null pkgsrc/databases/mysql51-client/patches/patch-client_mysql.cc:1.1
--- /dev/null   Thu Feb  1 23:14:55 2018
+++ pkgsrc/databases/mysql51-client/patches/patch-client_mysql.cc       Thu Feb  1 23:14:55 2018
@@ -0,0 +1,15 @@
+$NetBSD: patch-client_mysql.cc,v 1.1 2018/02/01 23:14:55 jperkin Exp $
+
+Compilation warning fix from upstream.
+
+--- client/mysql.cc.orig       2013-11-04 18:52:27.000000000 +0000
++++ client/mysql.cc
+@@ -2684,7 +2684,7 @@ You can turn off this feature to get a q
+         mysql_free_result(fields);
+         break;
+       }
+-      field_names[i][num_fields*2]= '\0';
++      field_names[i][num_fields*2]= NULL;
+       j=0;
+       while ((sql_field=mysql_fetch_field(fields)))
+       {