>Number:         22560
>Category:       pkg
>Synopsis:       MySQL should compiled with more charset support
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Thu Aug 21 16:38:00 UTC 2003
>Closed-Date:
>Last-Modified:
>Originator:     Takahiro Kambe
>Release:        NetBSD 1.6W
>Organization:
Takahiro Kambe
>Environment:
	
	
System: NetBSD edge.back-street.net 1.6W NetBSD 1.6W (CF-R1) #2: Wed Aug 20 18:12:29 JST 2003 taca@edge.back-street.net:/var/obj/sys/arch/i386/compile.i386/CF-R1 i386
Architecture: i386
Machine: i386
>Description:
	MySQL should compiled with more charset support.
>How-To-Repeat:
	It dosen't utilize charset related option.
>Fix:
	Introduce two charset support macros.

Index: databases/mysql-client/Makefile.common
===================================================================
RCS file: /cvsroot/pkgsrc/databases/mysql-client/Makefile.common,v
retrieving revision 1.16
diff -u -p -u -r1.16 Makefile.common
--- databases/mysql-client/Makefile.common	2003/07/17 21:28:22	1.16
+++ databases/mysql-client/Makefile.common	2003/08/21 16:35:08
@@ -21,6 +21,12 @@ MYSQL_USER?=		mysql
 MYSQL_GROUP?=		mysql
 MYSQL_DATADIR?=		/var/mysql
 
+# MYSQL_CHARSET		default character set
+# MYSQL_EXTRA_CHARSET	additonal character set to be compiled in.
+#
+MYSQL_CHARSET?=		latin1
+MYSQL_EXTRA_CHARSET?=	all
+
 USE_BUILDLINK2=		# defined
 GNU_CONFIGURE=		# defined
 CONFIGURE_ARGS+=	--localstatedir=${MYSQL_DATADIR}
@@ -37,6 +43,9 @@ CONFIGURE_ARGS+=	--without-docs
 CONFIGURE_ARGS+=	--without-debug
 CONFIGURE_ARGS+=	--without-bench
 CONFIGURE_ARGS+=	--with-low-memory
+
+CONFIGURE_ARGS+=	--with-charset=${MYSQL_CHARSET}
+CONFIGURE_ARGS+=	--with-extra-charsets=${MYSQL_EXTRA_CHARSET}
 
 CPPFLAGS+=		-Dunix
 
Index: mk/bsd.pkg.defaults.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mk/bsd.pkg.defaults.mk,v
retrieving revision 1.175
diff -u -p -u -r1.175 bsd.pkg.defaults.mk
--- mk/bsd.pkg.defaults.mk	2003/08/08 12:04:40	1.175
+++ mk/bsd.pkg.defaults.mk	2003/08/21 16:35:11
@@ -1318,6 +1318,19 @@ MUTT_USE_SSL?= YES
 # Possible: any directory
 # Default: /var/mysql
 
+#MYSQL_CHARSET=		latin1
+# default character set of mysql.
+# Possible: big5, cp1251, cp1257, croat, czech, danish, dec8, dos, estonia,
+#	    euc_kr, gb2312, gbk, german1, greek, hebrew, hp8, hungarian,
+#	    koi8_ru, koi8_ukr, latin1, latin2, latin5, swe7, usa7, win1250,
+#	    win1251ukr, ujis, sjis and tis620
+# Default: latin1
+
+#MYSQL_EXTRA_CHARSET=	all
+# additional charsets to be compiled in mysql.
+# Possible: none, compolex, all or list selected from MYSQL_CHARSET's
+#	    possible values.
+
 NMH_EDITOR?= vi
 # default editor for use in nmh.
 # Possible: any editor.

>Release-Note:
>Audit-Trail:
>Unformatted: