From owner-svn-ports-all@freebsd.org Sun Jul 29 12:55:57 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 63E641056A8D; Sun, 29 Jul 2018 12:55:57 +0000 (UTC) (envelope-from joneum@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 1378E8062B; Sun, 29 Jul 2018 12:55:57 +0000 (UTC) (envelope-from joneum@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id DCCB716103; Sun, 29 Jul 2018 12:55:56 +0000 (UTC) (envelope-from joneum@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w6TCtu9Y042320; Sun, 29 Jul 2018 12:55:56 GMT (envelope-from joneum@FreeBSD.org) Received: (from joneum@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w6TCtuqf042319; Sun, 29 Jul 2018 12:55:56 GMT (envelope-from joneum@FreeBSD.org) Message-Id: <201807291255.w6TCtuqf042319@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: joneum set sender to joneum@FreeBSD.org using -f From: Jochen Neumeister Date: Sun, 29 Jul 2018 12:55:56 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r475659 - head/databases/mysql++3/files X-SVN-Group: ports-head X-SVN-Commit-Author: joneum X-SVN-Commit-Paths: head/databases/mysql++3/files X-SVN-Commit-Revision: 475659 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Jul 2018 12:55:57 -0000 Author: joneum Date: Sun Jul 29 12:55:56 2018 New Revision: 475659 URL: https://svnweb.freebsd.org/changeset/ports/475659 Log: databases/mysql++3: Fix build with MariaDB 10.2 ./lib/dbdriver.cpp:260:10: error: use of undeclared identifier 'CLIENT_LONG_PASSWORD' (o >= CLIENT_LONG_PASSWORD) && ^ 1 warning and 1 error generated. gmake[1]: *** [Makefile:545: mysqlpp_dbdriver.o] Error 1 PR: 229950 Submitted by: Ting-Wei Lan (maintainer) Added: head/databases/mysql++3/files/patch-lib_dbdriver.cpp (contents, props changed) Added: head/databases/mysql++3/files/patch-lib_dbdriver.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/mysql++3/files/patch-lib_dbdriver.cpp Sun Jul 29 12:55:56 2018 (r475659) @@ -0,0 +1,19 @@ +https://tangentsoft.com/mysqlpp/info/4f077284dd2ca1b6 +https://tangentsoft.com/mysqlpp/info/e5f2c3d83f + +Index: lib/dbdriver.cpp +================================================================== +--- lib/dbdriver.cpp.orig 2015-03-19 00:55:17 UTC ++++ lib/dbdriver.cpp +@@ -257,7 +257,11 @@ DBDriver::set_option(unsigned int o, boo + } + + if ((n == 1) && ++#ifdef CLIENT_LONG_PASSWORD + (o >= CLIENT_LONG_PASSWORD) && ++#else ++ (o >= CLIENT_MYSQL) && ++#endif + #if MYSQL_VERSION_ID > 40000 // highest flag value varies by version + (o <= CLIENT_MULTI_RESULTS) + #else