From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Nov 9 12:40:01 2012 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 75DE84E1 for ; Fri, 9 Nov 2012 12:40:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id 4A0868FC12 for ; Fri, 9 Nov 2012 12:40:01 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id qA9Ce1SK052215 for ; Fri, 9 Nov 2012 12:40:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id qA9Ce1FH052214; Fri, 9 Nov 2012 12:40:01 GMT (envelope-from gnats) Resent-Date: Fri, 9 Nov 2012 12:40:01 GMT Resent-Message-Id: <201211091240.qA9Ce1FH052214@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Hon-Yu Lawrence Cheung Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id E84A93A1 for ; Fri, 9 Nov 2012 12:34:27 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22]) by mx1.freebsd.org (Postfix) with ESMTP id CF39B8FC08 for ; Fri, 9 Nov 2012 12:34:27 +0000 (UTC) Received: from red.freebsd.org (localhost [127.0.0.1]) by red.freebsd.org (8.14.5/8.14.5) with ESMTP id qA9CYRGI012930 for ; Fri, 9 Nov 2012 12:34:27 GMT (envelope-from nobody@red.freebsd.org) Received: (from nobody@localhost) by red.freebsd.org (8.14.5/8.14.5/Submit) id qA9CYRfQ012929; Fri, 9 Nov 2012 12:34:27 GMT (envelope-from nobody) Message-Id: <201211091234.qA9CYRfQ012929@red.freebsd.org> Date: Fri, 9 Nov 2012 12:34:27 GMT From: Hon-Yu Lawrence Cheung To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Subject: ports/173497: [PATCH] databases/mysql55-server: add two options for multibyte charset mysql user X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 Nov 2012 12:40:01 -0000 >Number: 173497 >Category: ports >Synopsis: [PATCH] databases/mysql55-server: add two options for multibyte charset mysql user >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Fri Nov 09 12:40:00 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Hon-Yu Lawrence Cheung >Release: FreBSD 9.1-RC3 >Organization: >Environment: FreeBSD a5552.honyucheung.net 9.1-RC3 FreeBSD 9.1-RC3 #2 r242544: Sun Nov 4 10:30:38 HKT 2012 root@a5552.honyucheung.net:/usr/obj/usr/src/sys/ACER5552 amd64 >Description: After using cmake to compile mysql55-server, user cannot pass WITH_CHARSET to alter default charset of mysql55-server. UTF8 may be the first choice for almost multbyte charset mysql user. This patch adds 1) Default charset to UTF8 2) Add extra charset complex support >How-To-Repeat: >Fix: Patch attached with submission follows: --- Makefile.orig 2012-10-12 21:44:59.000000000 +0800 +++ Makefile 2012-11-09 20:27:22.000000000 +0800 @@ -17,10 +17,12 @@ MAKE_JOBS_SAFE= yes NO_OPTIONS_SORT=yes -OPTIONS_DEFINE= SSL FASTMTX +OPTIONS_DEFINE= SSL FASTMTX UTF8 COMPLEX OPTIONS_DEFAULT=SSL FASTMTX_DESC= Replace mutexes with spinlocks +UTF8_DESC= Default charset with UTF8 +COMPLEX_DESC= Install extra charset complex CMAKE_ARGS+= -DINSTALL_DOCDIR="share/doc/mysql" \ -DINSTALL_DOCREADMEDIR="share/doc/mysql" \ @@ -38,7 +40,7 @@ -DINSTALL_SQLBENCHDIR="share/mysql" \ -DINSTALL_SUPPORTFILESDIR="share/mysql" \ -DWITH_LIBEDIT=0 \ - -DWITH_LIBWRAP=1 + -DWITH_LIBWRAP=1 .ifdef USE_MYSQL .error You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again. @@ -53,6 +55,15 @@ CMAKE_ARGS+= -DWITH_FAST_MUTEXES=1 .endif +.if ${PORT_OPTIONS:MUTF8} +CMAKE_ARG+= -DDEFAULT_CHARSET="utf8" +CMAKE_ARG+= -DDEFAULT_COLLATION="utf8_general_ci" +.endif + +.if ${PORT_OPTIONS:MCOMPLEX} +CMAKE_ARG+= -DWITH_EXTRA_CHARSETS="complex" +.endif + # MySQL-Server part .if !defined(CLIENT_ONLY) USE_MYSQL= yes >Release-Note: >Audit-Trail: >Unformatted: