Add options for alternate charsets (WITH_CHARSET and WITH_XCHARSET).

Submitted by:	roam

9 files changed, 135 insertions, 0 deletions

diff --git a/databases/mysql323-server/Makefile b/databases/mysql323-server/Makefile
index b839c992d391..0067223ed025 100644
--- a/databases/mysql323-server/Makefile
+++ b/databases/mysql323-server/Makefile
@@ -35,6 +35,12 @@ CONFIGURE_ARGS=	--localstatedir=${DB_DIR} \
 .if ${MACHINE_ARCH} == "i386"
 CONFIGURE_ARGS+=--enable-assembler
 .endif
+.if defined(WITH_CHARSET) && ${WITH_CHARSET} != ""
+CONFIGURE_ARGS+=--with-charset=${WITH_CHARSET}
+.if defined(WITH_XCHARSET) && ${WITH_XCHARSET} != ""
+CONFIGURE_ARGS+=--with-extra-charsets=${WITH_XCHARSET}
+.endif
+.endif
 CONFIGURE_ENV+=	PERL=${PERL} \
 		PERL5=${PERL} \
 		INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
@@ -48,6 +54,15 @@ CXXFLAGS=	${CFLAGS} -felide-constructors -fno-rtti
 CXXFLAGS+=	-fno-exceptions
 .endif
 
+pre-fetch:
+	@${ECHO} ""
+	@${ECHO} "You may use the following build options:"
+	@${ECHO} ""
+	@${ECHO} "	WITH_CHARSET=charset	define the primary built-in charset (Latin1);"
+	@${ECHO} "	WITH_XCHARSET=list	define other built-in charsets (may be 'all');"
+	@${ECHO} "	DB_DIR=directory	Set alternate directory for database files."
+	@${ECHO} ""
+
 # MySQL-Server part
 .if !defined(CLIENT_ONLY)
 MASTER_SITE_SUBDIR+=	db
diff --git a/databases/mysql40-server/Makefile b/databases/mysql40-server/Makefile
index b839c992d391..0067223ed025 100644
--- a/databases/mysql40-server/Makefile
+++ b/databases/mysql40-server/Makefile
@@ -35,6 +35,12 @@ CONFIGURE_ARGS=	--localstatedir=${DB_DIR} \
 .if ${MACHINE_ARCH} == "i386"
 CONFIGURE_ARGS+=--enable-assembler
 .endif
+.if defined(WITH_CHARSET) && ${WITH_CHARSET} != ""
+CONFIGURE_ARGS+=--with-charset=${WITH_CHARSET}
+.if defined(WITH_XCHARSET) && ${WITH_XCHARSET} != ""
+CONFIGURE_ARGS+=--with-extra-charsets=${WITH_XCHARSET}
+.endif
+.endif
 CONFIGURE_ENV+=	PERL=${PERL} \
 		PERL5=${PERL} \
 		INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
@@ -48,6 +54,15 @@ CXXFLAGS=	${CFLAGS} -felide-constructors -fno-rtti
 CXXFLAGS+=	-fno-exceptions
 .endif
 
+pre-fetch:
+	@${ECHO} ""
+	@${ECHO} "You may use the following build options:"
+	@${ECHO} ""
+	@${ECHO} "	WITH_CHARSET=charset	define the primary built-in charset (Latin1);"
+	@${ECHO} "	WITH_XCHARSET=list	define other built-in charsets (may be 'all');"
+	@${ECHO} "	DB_DIR=directory	Set alternate directory for database files."
+	@${ECHO} ""
+
 # MySQL-Server part
 .if !defined(CLIENT_ONLY)
 MASTER_SITE_SUBDIR+=	db
diff --git a/databases/mysql41-server/Makefile b/databases/mysql41-server/Makefile
index b839c992d391..0067223ed025 100644
--- a/databases/mysql41-server/Makefile
+++ b/databases/mysql41-server/Makefile
@@ -35,6 +35,12 @@ CONFIGURE_ARGS=	--localstatedir=${DB_DIR} \
 .if ${MACHINE_ARCH} == "i386"
 CONFIGURE_ARGS+=--enable-assembler
 .endif
+.if defined(WITH_CHARSET) && ${WITH_CHARSET} != ""
+CONFIGURE_ARGS+=--with-charset=${WITH_CHARSET}
+.if defined(WITH_XCHARSET) && ${WITH_XCHARSET} != ""
+CONFIGURE_ARGS+=--with-extra-charsets=${WITH_XCHARSET}
+.endif
+.endif
 CONFIGURE_ENV+=	PERL=${PERL} \
 		PERL5=${PERL} \
 		INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
@@ -48,6 +54,15 @@ CXXFLAGS=	${CFLAGS} -felide-constructors -fno-rtti
 CXXFLAGS+=	-fno-exceptions
 .endif
 
+pre-fetch:
+	@${ECHO} ""
+	@${ECHO} "You may use the following build options:"
+	@${ECHO} ""
+	@${ECHO} "	WITH_CHARSET=charset	define the primary built-in charset (Latin1);"
+	@${ECHO} "	WITH_XCHARSET=list	define other built-in charsets (may be 'all');"
+	@${ECHO} "	DB_DIR=directory	Set alternate directory for database files."
+	@${ECHO} ""
+
 # MySQL-Server part
 .if !defined(CLIENT_ONLY)
 MASTER_SITE_SUBDIR+=	db
diff --git a/databases/mysql50-server/Makefile b/databases/mysql50-server/Makefile
index b839c992d391..0067223ed025 100644
--- a/databases/mysql50-server/Makefile
+++ b/databases/mysql50-server/Makefile
@@ -35,6 +35,12 @@ CONFIGURE_ARGS=	--localstatedir=${DB_DIR} \
 .if ${MACHINE_ARCH} == "i386"
 CONFIGURE_ARGS+=--enable-assembler
 .endif
+.if defined(WITH_CHARSET) && ${WITH_CHARSET} != ""
+CONFIGURE_ARGS+=--with-charset=${WITH_CHARSET}
+.if defined(WITH_XCHARSET) && ${WITH_XCHARSET} != ""
+CONFIGURE_ARGS+=--with-extra-charsets=${WITH_XCHARSET}
+.endif
+.endif
 CONFIGURE_ENV+=	PERL=${PERL} \
 		PERL5=${PERL} \
 		INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
@@ -48,6 +54,15 @@ CXXFLAGS=	${CFLAGS} -felide-constructors -fno-rtti
 CXXFLAGS+=	-fno-exceptions
 .endif
 
+pre-fetch:
+	@${ECHO} ""
+	@${ECHO} "You may use the following build options:"
+	@${ECHO} ""
+	@${ECHO} "	WITH_CHARSET=charset	define the primary built-in charset (Latin1);"
+	@${ECHO} "	WITH_XCHARSET=list	define other built-in charsets (may be 'all');"
+	@${ECHO} "	DB_DIR=directory	Set alternate directory for database files."
+	@${ECHO} ""
+
 # MySQL-Server part
 .if !defined(CLIENT_ONLY)
 MASTER_SITE_SUBDIR+=	db
diff --git a/databases/mysql51-server/Makefile b/databases/mysql51-server/Makefile
index b839c992d391..0067223ed025 100644
--- a/databases/mysql51-server/Makefile
+++ b/databases/mysql51-server/Makefile
@@ -35,6 +35,12 @@ CONFIGURE_ARGS=	--localstatedir=${DB_DIR} \
 .if ${MACHINE_ARCH} == "i386"
 CONFIGURE_ARGS+=--enable-assembler
 .endif
+.if defined(WITH_CHARSET) && ${WITH_CHARSET} != ""
+CONFIGURE_ARGS+=--with-charset=${WITH_CHARSET}
+.if defined(WITH_XCHARSET) && ${WITH_XCHARSET} != ""
+CONFIGURE_ARGS+=--with-extra-charsets=${WITH_XCHARSET}
+.endif
+.endif
 CONFIGURE_ENV+=	PERL=${PERL} \
 		PERL5=${PERL} \
 		INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
@@ -48,6 +54,15 @@ CXXFLAGS=	${CFLAGS} -felide-constructors -fno-rtti
 CXXFLAGS+=	-fno-exceptions
 .endif
 
+pre-fetch:
+	@${ECHO} ""
+	@${ECHO} "You may use the following build options:"
+	@${ECHO} ""
+	@${ECHO} "	WITH_CHARSET=charset	define the primary built-in charset (Latin1);"
+	@${ECHO} "	WITH_XCHARSET=list	define other built-in charsets (may be 'all');"
+	@${ECHO} "	DB_DIR=directory	Set alternate directory for database files."
+	@${ECHO} ""
+
 # MySQL-Server part
 .if !defined(CLIENT_ONLY)
 MASTER_SITE_SUBDIR+=	db
diff --git a/databases/mysql54-server/Makefile b/databases/mysql54-server/Makefile
index b839c992d391..0067223ed025 100644
--- a/databases/mysql54-server/Makefile
+++ b/databases/mysql54-server/Makefile
@@ -35,6 +35,12 @@ CONFIGURE_ARGS=	--localstatedir=${DB_DIR} \
 .if ${MACHINE_ARCH} == "i386"
 CONFIGURE_ARGS+=--enable-assembler
 .endif
+.if defined(WITH_CHARSET) && ${WITH_CHARSET} != ""
+CONFIGURE_ARGS+=--with-charset=${WITH_CHARSET}
+.if defined(WITH_XCHARSET) && ${WITH_XCHARSET} != ""
+CONFIGURE_ARGS+=--with-extra-charsets=${WITH_XCHARSET}
+.endif
+.endif
 CONFIGURE_ENV+=	PERL=${PERL} \
 		PERL5=${PERL} \
 		INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
@@ -48,6 +54,15 @@ CXXFLAGS=	${CFLAGS} -felide-constructors -fno-rtti
 CXXFLAGS+=	-fno-exceptions
 .endif
 
+pre-fetch:
+	@${ECHO} ""
+	@${ECHO} "You may use the following build options:"
+	@${ECHO} ""
+	@${ECHO} "	WITH_CHARSET=charset	define the primary built-in charset (Latin1);"
+	@${ECHO} "	WITH_XCHARSET=list	define other built-in charsets (may be 'all');"
+	@${ECHO} "	DB_DIR=directory	Set alternate directory for database files."
+	@${ECHO} ""
+
 # MySQL-Server part
 .if !defined(CLIENT_ONLY)
 MASTER_SITE_SUBDIR+=	db
diff --git a/databases/mysql55-server/Makefile b/databases/mysql55-server/Makefile
index b839c992d391..0067223ed025 100644
--- a/databases/mysql55-server/Makefile
+++ b/databases/mysql55-server/Makefile
@@ -35,6 +35,12 @@ CONFIGURE_ARGS=	--localstatedir=${DB_DIR} \
 .if ${MACHINE_ARCH} == "i386"
 CONFIGURE_ARGS+=--enable-assembler
 .endif
+.if defined(WITH_CHARSET) && ${WITH_CHARSET} != ""
+CONFIGURE_ARGS+=--with-charset=${WITH_CHARSET}
+.if defined(WITH_XCHARSET) && ${WITH_XCHARSET} != ""
+CONFIGURE_ARGS+=--with-extra-charsets=${WITH_XCHARSET}
+.endif
+.endif
 CONFIGURE_ENV+=	PERL=${PERL} \
 		PERL5=${PERL} \
 		INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
@@ -48,6 +54,15 @@ CXXFLAGS=	${CFLAGS} -felide-constructors -fno-rtti
 CXXFLAGS+=	-fno-exceptions
 .endif
 
+pre-fetch:
+	@${ECHO} ""
+	@${ECHO} "You may use the following build options:"
+	@${ECHO} ""
+	@${ECHO} "	WITH_CHARSET=charset	define the primary built-in charset (Latin1);"
+	@${ECHO} "	WITH_XCHARSET=list	define other built-in charsets (may be 'all');"
+	@${ECHO} "	DB_DIR=directory	Set alternate directory for database files."
+	@${ECHO} ""
+
 # MySQL-Server part
 .if !defined(CLIENT_ONLY)
 MASTER_SITE_SUBDIR+=	db
diff --git a/databases/mysql60-server/Makefile b/databases/mysql60-server/Makefile
index b839c992d391..0067223ed025 100644
--- a/databases/mysql60-server/Makefile
+++ b/databases/mysql60-server/Makefile
@@ -35,6 +35,12 @@ CONFIGURE_ARGS=	--localstatedir=${DB_DIR} \
 .if ${MACHINE_ARCH} == "i386"
 CONFIGURE_ARGS+=--enable-assembler
 .endif
+.if defined(WITH_CHARSET) && ${WITH_CHARSET} != ""
+CONFIGURE_ARGS+=--with-charset=${WITH_CHARSET}
+.if defined(WITH_XCHARSET) && ${WITH_XCHARSET} != ""
+CONFIGURE_ARGS+=--with-extra-charsets=${WITH_XCHARSET}
+.endif
+.endif
 CONFIGURE_ENV+=	PERL=${PERL} \
 		PERL5=${PERL} \
 		INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
@@ -48,6 +54,15 @@ CXXFLAGS=	${CFLAGS} -felide-constructors -fno-rtti
 CXXFLAGS+=	-fno-exceptions
 .endif
 
+pre-fetch:
+	@${ECHO} ""
+	@${ECHO} "You may use the following build options:"
+	@${ECHO} ""
+	@${ECHO} "	WITH_CHARSET=charset	define the primary built-in charset (Latin1);"
+	@${ECHO} "	WITH_XCHARSET=list	define other built-in charsets (may be 'all');"
+	@${ECHO} "	DB_DIR=directory	Set alternate directory for database files."
+	@${ECHO} ""
+
 # MySQL-Server part
 .if !defined(CLIENT_ONLY)
 MASTER_SITE_SUBDIR+=	db
diff --git a/databases/percona55-server/Makefile b/databases/percona55-server/Makefile
index b839c992d391..0067223ed025 100644
--- a/databases/percona55-server/Makefile
+++ b/databases/percona55-server/Makefile
@@ -35,6 +35,12 @@ CONFIGURE_ARGS=	--localstatedir=${DB_DIR} \
 .if ${MACHINE_ARCH} == "i386"
 CONFIGURE_ARGS+=--enable-assembler
 .endif
+.if defined(WITH_CHARSET) && ${WITH_CHARSET} != ""
+CONFIGURE_ARGS+=--with-charset=${WITH_CHARSET}
+.if defined(WITH_XCHARSET) && ${WITH_XCHARSET} != ""
+CONFIGURE_ARGS+=--with-extra-charsets=${WITH_XCHARSET}
+.endif
+.endif
 CONFIGURE_ENV+=	PERL=${PERL} \
 		PERL5=${PERL} \
 		INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
@@ -48,6 +54,15 @@ CXXFLAGS=	${CFLAGS} -felide-constructors -fno-rtti
 CXXFLAGS+=	-fno-exceptions
 .endif
 
+pre-fetch:
+	@${ECHO} ""
+	@${ECHO} "You may use the following build options:"
+	@${ECHO} ""
+	@${ECHO} "	WITH_CHARSET=charset	define the primary built-in charset (Latin1);"
+	@${ECHO} "	WITH_XCHARSET=list	define other built-in charsets (may be 'all');"
+	@${ECHO} "	DB_DIR=directory	Set alternate directory for database files."
+	@${ECHO} ""
+
 # MySQL-Server part
 .if !defined(CLIENT_ONLY)
 MASTER_SITE_SUBDIR+=	db