From a42dd24d655b5b6b99fbfeac91eeb46d7a970ba9 Mon Sep 17 00:00:00 2001
From: obache <obache>
Date: Sat, 15 Sep 2012 14:48:57 +0000
Subject: Update mysql51 to 5.1.65.

While here, let to use OpenSSL instead of internal yaSSL with ssl option,
may related to PR 46912.

Changes in MySQL 5.1.65 (2012-08-09)

Functionality Added or Changed

* Important Change: The YEAR(2) data type is now deprecated because it is
  problematic. Support for YEAR(2) will be removed in a future release of MySQL.
  For more information, see Section 11.3.4, "YEAR(2) Limitations and Migrating
  to YEAR(4)".

Bugs Fixed

 * The server did not build with gcc 4.7. (Bug #14238406)

Changes in MySQL 5.1.64 (Not released)

Functionality Added or Changed

* Important Change: Replication: The SHOW BINARY LOGS statement (and its
  equivalent SHOW MASTER LOGS) may now be executed by a user with the
  REPLICATION CLIENT privilege. (Formerly, the SUPER privilege was necessary to
  use either form of this statement.)
---
 databases/mysql51-client/Makefile.common |  4 ++--
 databases/mysql51-client/distinfo        |  8 ++++----
 databases/mysql51-client/options.mk      | 13 ++-----------
 3 files changed, 8 insertions(+), 17 deletions(-)

(limited to 'databases/mysql51-client')

diff --git a/databases/mysql51-client/Makefile.common b/databases/mysql51-client/Makefile.common
index 125c5846ad9..a2cc5e81232 100644
--- a/databases/mysql51-client/Makefile.common
+++ b/databases/mysql51-client/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.25 2012/05/13 12:59:39 taca Exp $
+# $NetBSD: Makefile.common,v 1.26 2012/09/15 14:48:57 obache Exp $
 #
 # used by databases/mysql51-client/Makefile
 # used by databases/mysql51-server/Makefile
 
-DISTNAME=	mysql-5.1.63
+DISTNAME=	mysql-5.1.65
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL:=MySQL-5.1/}
 
diff --git a/databases/mysql51-client/distinfo b/databases/mysql51-client/distinfo
index b8b5ea99c36..835e801e3db 100644
--- a/databases/mysql51-client/distinfo
+++ b/databases/mysql51-client/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.22 2012/05/13 12:59:39 taca Exp $
+$NetBSD: distinfo,v 1.23 2012/09/15 14:48:57 obache Exp $
 
-SHA1 (mysql-5.1.63.tar.gz) = ce1743098b53540cb75c144d71299bace7398aef
-RMD160 (mysql-5.1.63.tar.gz) = d5e9afab1d7fdce959400376398593b59fff6814
-Size (mysql-5.1.63.tar.gz) = 24517173 bytes
+SHA1 (mysql-5.1.65.tar.gz) = 9af3740d0a9f3fb2a9423500dd298b423867cf6e
+RMD160 (mysql-5.1.65.tar.gz) = f777be188656bf5ff4c486e2ecf8faf7f9969d99
+Size (mysql-5.1.65.tar.gz) = 24673939 bytes
 SHA1 (patch-aa) = 344bc9ab7013fbf64be6adbe8a9fc6279887beb1
 SHA1 (patch-ab) = a1c699ebd9dc7e2cec9354035cbd9fdc2a411175
 SHA1 (patch-ac) = a250b9797fbaad51d054cbb324feb0f7c29096d4
diff --git a/databases/mysql51-client/options.mk b/databases/mysql51-client/options.mk
index 956aa1c5dea..1ff29d3d30c 100644
--- a/databases/mysql51-client/options.mk
+++ b/databases/mysql51-client/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.4 2011/03/17 13:26:04 adam Exp $
+# $NetBSD: options.mk,v 1.5 2012/09/15 14:48:57 obache Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.mysql5
 
@@ -12,16 +12,7 @@ PKG_SUGGESTED_OPTIONS+=	embedded-server mysqlmanager ndb-cluster pstack ssl
 ###
 .if !empty(PKG_OPTIONS:Mssl)
 .	include "../../security/openssl/buildlink3.mk"
-.  if ${OPSYS} == "SunOS"
-CHECK_BUILTIN.openssl:=yes
-.    include "../../security/openssl/builtin.mk"
-CHECK_BUILTIN.openssl:=no
-.    if ${USE_BUILTIN.openssl} == "yes"
-CONFIGURE_ARGS+=	--with-ssl=yes
-.    endif
-.  else
-CONFIGURE_ARGS+=	--with-ssl=yes
-.  endif
+CONFIGURE_ARGS+=	--with-ssl=${BUILDLINK_PREFIX.openssl}
 .else
 CONFIGURE_ARGS+=	--without-ssl
 .endif
-- 
cgit v1.2.3