- CXX=${CC} to get rid of libstdc++ in order to improve stability

  under heavy load

- add BUILD_STATIC option to link mysqld statically

- add BUILD_OPTIMIZED to add -mcpu=pentiumpro -O3 -fno-omit-frame-pointer
  to CFLAGS (and thus to CXXFLAGS)

Submitted by:	Sergei Golubchik <serg@mysql.com>

9 files changed, 99 insertions, 9 deletions

diff --git a/databases/mysql323-server/Makefile b/databases/mysql323-server/Makefile
index d2059df..77a17bc 100644
--- a/databases/mysql323-server/Makefile
+++ b/databases/mysql323-server/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME?=	${MASTERPORTNAME}
 PORTVERSION=	3.23.46
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://www.kernelnotes.de/MySQL/Downloads/MySQL-3.23/ \
@@ -41,6 +41,12 @@ CONFIGURE_ARGS+=--with-charset=${WITH_CHARSET}
 CONFIGURE_ARGS+=--with-extra-charsets=${WITH_XCHARSET}
 .endif
 .endif
+.if defined(BUILD_STATIC)
+CONFIGURE_ARGS+=--with-mysqld-ldflags=--static
+.endif
+.if defined(BUILD_OPTIMIZED)
+CFLAGS+=	-mcpu=pentiumpro -O3 -fno-omit-frame-pointer
+.endif
 .if defined(WITH_LINUXTHREADS)
 CONFIGURE_ARGS+=--with-named-thread-libs='-DHAVE_GLIBC2_STYLE_GETHOSTBYNAME_R -D_THREAD_SAFE -I${LOCALBASE}/include/pthread/linuxthreads -L${LOCALBASE}/lib -llthread -llgcc_r'
 CFLAGS+=	-D__USE_UNIX98 -D_REENTRANT -D_THREAD_SAFE -I${LOCALBASE}/include/pthread/linuxthreads
@@ -49,6 +55,7 @@ LIB_DEPENDS+=	lthread.2:${PORTSDIR}/devel/linuxthreads
 CONFIGURE_ENV+=	PERL=${PERL} \
 		PERL5=${PERL} \
 		INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
+		CXX="${CC}" \
 		CFLAGS="${CFLAGS}" \
 		CONFIGURE_ARGS="${CONFIGURE_ARGS}"
 
@@ -86,6 +93,9 @@ pre-fetch:
 	@${ECHO} "				DNS check before inserting local hostname to"
 	@${ECHO} "				mysql database."
 	@${ECHO} "				Use if your machine has no offical DNS entry."
+	@${ECHO} "	BUILD_STATIC=yes	Build a static version of mysqld."
+	@${ECHO} "	BUILD_OPTIMIZED=yes	Add -mcpu=pentiumpro -O3 -fno-omit-frame-pointer"
+	@${ECHO} "				to CFLAGS."
 	@${ECHO} ""
 
 post-patch:
diff --git a/databases/mysql40-server/Makefile b/databases/mysql40-server/Makefile
index d2059df..77a17bc 100644
--- a/databases/mysql40-server/Makefile
+++ b/databases/mysql40-server/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME?=	${MASTERPORTNAME}
 PORTVERSION=	3.23.46
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://www.kernelnotes.de/MySQL/Downloads/MySQL-3.23/ \
@@ -41,6 +41,12 @@ CONFIGURE_ARGS+=--with-charset=${WITH_CHARSET}
 CONFIGURE_ARGS+=--with-extra-charsets=${WITH_XCHARSET}
 .endif
 .endif
+.if defined(BUILD_STATIC)
+CONFIGURE_ARGS+=--with-mysqld-ldflags=--static
+.endif
+.if defined(BUILD_OPTIMIZED)
+CFLAGS+=	-mcpu=pentiumpro -O3 -fno-omit-frame-pointer
+.endif
 .if defined(WITH_LINUXTHREADS)
 CONFIGURE_ARGS+=--with-named-thread-libs='-DHAVE_GLIBC2_STYLE_GETHOSTBYNAME_R -D_THREAD_SAFE -I${LOCALBASE}/include/pthread/linuxthreads -L${LOCALBASE}/lib -llthread -llgcc_r'
 CFLAGS+=	-D__USE_UNIX98 -D_REENTRANT -D_THREAD_SAFE -I${LOCALBASE}/include/pthread/linuxthreads
@@ -49,6 +55,7 @@ LIB_DEPENDS+=	lthread.2:${PORTSDIR}/devel/linuxthreads
 CONFIGURE_ENV+=	PERL=${PERL} \
 		PERL5=${PERL} \
 		INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
+		CXX="${CC}" \
 		CFLAGS="${CFLAGS}" \
 		CONFIGURE_ARGS="${CONFIGURE_ARGS}"
 
@@ -86,6 +93,9 @@ pre-fetch:
 	@${ECHO} "				DNS check before inserting local hostname to"
 	@${ECHO} "				mysql database."
 	@${ECHO} "				Use if your machine has no offical DNS entry."
+	@${ECHO} "	BUILD_STATIC=yes	Build a static version of mysqld."
+	@${ECHO} "	BUILD_OPTIMIZED=yes	Add -mcpu=pentiumpro -O3 -fno-omit-frame-pointer"
+	@${ECHO} "				to CFLAGS."
 	@${ECHO} ""
 
 post-patch:
diff --git a/databases/mysql41-server/Makefile b/databases/mysql41-server/Makefile
index d2059df..77a17bc 100644
--- a/databases/mysql41-server/Makefile
+++ b/databases/mysql41-server/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME?=	${MASTERPORTNAME}
 PORTVERSION=	3.23.46
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://www.kernelnotes.de/MySQL/Downloads/MySQL-3.23/ \
@@ -41,6 +41,12 @@ CONFIGURE_ARGS+=--with-charset=${WITH_CHARSET}
 CONFIGURE_ARGS+=--with-extra-charsets=${WITH_XCHARSET}
 .endif
 .endif
+.if defined(BUILD_STATIC)
+CONFIGURE_ARGS+=--with-mysqld-ldflags=--static
+.endif
+.if defined(BUILD_OPTIMIZED)
+CFLAGS+=	-mcpu=pentiumpro -O3 -fno-omit-frame-pointer
+.endif
 .if defined(WITH_LINUXTHREADS)
 CONFIGURE_ARGS+=--with-named-thread-libs='-DHAVE_GLIBC2_STYLE_GETHOSTBYNAME_R -D_THREAD_SAFE -I${LOCALBASE}/include/pthread/linuxthreads -L${LOCALBASE}/lib -llthread -llgcc_r'
 CFLAGS+=	-D__USE_UNIX98 -D_REENTRANT -D_THREAD_SAFE -I${LOCALBASE}/include/pthread/linuxthreads
@@ -49,6 +55,7 @@ LIB_DEPENDS+=	lthread.2:${PORTSDIR}/devel/linuxthreads
 CONFIGURE_ENV+=	PERL=${PERL} \
 		PERL5=${PERL} \
 		INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
+		CXX="${CC}" \
 		CFLAGS="${CFLAGS}" \
 		CONFIGURE_ARGS="${CONFIGURE_ARGS}"
 
@@ -86,6 +93,9 @@ pre-fetch:
 	@${ECHO} "				DNS check before inserting local hostname to"
 	@${ECHO} "				mysql database."
 	@${ECHO} "				Use if your machine has no offical DNS entry."
+	@${ECHO} "	BUILD_STATIC=yes	Build a static version of mysqld."
+	@${ECHO} "	BUILD_OPTIMIZED=yes	Add -mcpu=pentiumpro -O3 -fno-omit-frame-pointer"
+	@${ECHO} "				to CFLAGS."
 	@${ECHO} ""
 
 post-patch:
diff --git a/databases/mysql50-server/Makefile b/databases/mysql50-server/Makefile
index d2059df..77a17bc 100644
--- a/databases/mysql50-server/Makefile
+++ b/databases/mysql50-server/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME?=	${MASTERPORTNAME}
 PORTVERSION=	3.23.46
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://www.kernelnotes.de/MySQL/Downloads/MySQL-3.23/ \
@@ -41,6 +41,12 @@ CONFIGURE_ARGS+=--with-charset=${WITH_CHARSET}
 CONFIGURE_ARGS+=--with-extra-charsets=${WITH_XCHARSET}
 .endif
 .endif
+.if defined(BUILD_STATIC)
+CONFIGURE_ARGS+=--with-mysqld-ldflags=--static
+.endif
+.if defined(BUILD_OPTIMIZED)
+CFLAGS+=	-mcpu=pentiumpro -O3 -fno-omit-frame-pointer
+.endif
 .if defined(WITH_LINUXTHREADS)
 CONFIGURE_ARGS+=--with-named-thread-libs='-DHAVE_GLIBC2_STYLE_GETHOSTBYNAME_R -D_THREAD_SAFE -I${LOCALBASE}/include/pthread/linuxthreads -L${LOCALBASE}/lib -llthread -llgcc_r'
 CFLAGS+=	-D__USE_UNIX98 -D_REENTRANT -D_THREAD_SAFE -I${LOCALBASE}/include/pthread/linuxthreads
@@ -49,6 +55,7 @@ LIB_DEPENDS+=	lthread.2:${PORTSDIR}/devel/linuxthreads
 CONFIGURE_ENV+=	PERL=${PERL} \
 		PERL5=${PERL} \
 		INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
+		CXX="${CC}" \
 		CFLAGS="${CFLAGS}" \
 		CONFIGURE_ARGS="${CONFIGURE_ARGS}"
 
@@ -86,6 +93,9 @@ pre-fetch:
 	@${ECHO} "				DNS check before inserting local hostname to"
 	@${ECHO} "				mysql database."
 	@${ECHO} "				Use if your machine has no offical DNS entry."
+	@${ECHO} "	BUILD_STATIC=yes	Build a static version of mysqld."
+	@${ECHO} "	BUILD_OPTIMIZED=yes	Add -mcpu=pentiumpro -O3 -fno-omit-frame-pointer"
+	@${ECHO} "				to CFLAGS."
 	@${ECHO} ""
 
 post-patch:
diff --git a/databases/mysql51-server/Makefile b/databases/mysql51-server/Makefile
index d2059df..77a17bc 100644
--- a/databases/mysql51-server/Makefile
+++ b/databases/mysql51-server/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME?=	${MASTERPORTNAME}
 PORTVERSION=	3.23.46
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://www.kernelnotes.de/MySQL/Downloads/MySQL-3.23/ \
@@ -41,6 +41,12 @@ CONFIGURE_ARGS+=--with-charset=${WITH_CHARSET}
 CONFIGURE_ARGS+=--with-extra-charsets=${WITH_XCHARSET}
 .endif
 .endif
+.if defined(BUILD_STATIC)
+CONFIGURE_ARGS+=--with-mysqld-ldflags=--static
+.endif
+.if defined(BUILD_OPTIMIZED)
+CFLAGS+=	-mcpu=pentiumpro -O3 -fno-omit-frame-pointer
+.endif
 .if defined(WITH_LINUXTHREADS)
 CONFIGURE_ARGS+=--with-named-thread-libs='-DHAVE_GLIBC2_STYLE_GETHOSTBYNAME_R -D_THREAD_SAFE -I${LOCALBASE}/include/pthread/linuxthreads -L${LOCALBASE}/lib -llthread -llgcc_r'
 CFLAGS+=	-D__USE_UNIX98 -D_REENTRANT -D_THREAD_SAFE -I${LOCALBASE}/include/pthread/linuxthreads
@@ -49,6 +55,7 @@ LIB_DEPENDS+=	lthread.2:${PORTSDIR}/devel/linuxthreads
 CONFIGURE_ENV+=	PERL=${PERL} \
 		PERL5=${PERL} \
 		INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
+		CXX="${CC}" \
 		CFLAGS="${CFLAGS}" \
 		CONFIGURE_ARGS="${CONFIGURE_ARGS}"
 
@@ -86,6 +93,9 @@ pre-fetch:
 	@${ECHO} "				DNS check before inserting local hostname to"
 	@${ECHO} "				mysql database."
 	@${ECHO} "				Use if your machine has no offical DNS entry."
+	@${ECHO} "	BUILD_STATIC=yes	Build a static version of mysqld."
+	@${ECHO} "	BUILD_OPTIMIZED=yes	Add -mcpu=pentiumpro -O3 -fno-omit-frame-pointer"
+	@${ECHO} "				to CFLAGS."
 	@${ECHO} ""
 
 post-patch:
diff --git a/databases/mysql54-server/Makefile b/databases/mysql54-server/Makefile
index d2059df..77a17bc 100644
--- a/databases/mysql54-server/Makefile
+++ b/databases/mysql54-server/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME?=	${MASTERPORTNAME}
 PORTVERSION=	3.23.46
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://www.kernelnotes.de/MySQL/Downloads/MySQL-3.23/ \
@@ -41,6 +41,12 @@ CONFIGURE_ARGS+=--with-charset=${WITH_CHARSET}
 CONFIGURE_ARGS+=--with-extra-charsets=${WITH_XCHARSET}
 .endif
 .endif
+.if defined(BUILD_STATIC)
+CONFIGURE_ARGS+=--with-mysqld-ldflags=--static
+.endif
+.if defined(BUILD_OPTIMIZED)
+CFLAGS+=	-mcpu=pentiumpro -O3 -fno-omit-frame-pointer
+.endif
 .if defined(WITH_LINUXTHREADS)
 CONFIGURE_ARGS+=--with-named-thread-libs='-DHAVE_GLIBC2_STYLE_GETHOSTBYNAME_R -D_THREAD_SAFE -I${LOCALBASE}/include/pthread/linuxthreads -L${LOCALBASE}/lib -llthread -llgcc_r'
 CFLAGS+=	-D__USE_UNIX98 -D_REENTRANT -D_THREAD_SAFE -I${LOCALBASE}/include/pthread/linuxthreads
@@ -49,6 +55,7 @@ LIB_DEPENDS+=	lthread.2:${PORTSDIR}/devel/linuxthreads
 CONFIGURE_ENV+=	PERL=${PERL} \
 		PERL5=${PERL} \
 		INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
+		CXX="${CC}" \
 		CFLAGS="${CFLAGS}" \
 		CONFIGURE_ARGS="${CONFIGURE_ARGS}"
 
@@ -86,6 +93,9 @@ pre-fetch:
 	@${ECHO} "				DNS check before inserting local hostname to"
 	@${ECHO} "				mysql database."
 	@${ECHO} "				Use if your machine has no offical DNS entry."
+	@${ECHO} "	BUILD_STATIC=yes	Build a static version of mysqld."
+	@${ECHO} "	BUILD_OPTIMIZED=yes	Add -mcpu=pentiumpro -O3 -fno-omit-frame-pointer"
+	@${ECHO} "				to CFLAGS."
 	@${ECHO} ""
 
 post-patch:
diff --git a/databases/mysql55-server/Makefile b/databases/mysql55-server/Makefile
index d2059df..77a17bc 100644
--- a/databases/mysql55-server/Makefile
+++ b/databases/mysql55-server/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME?=	${MASTERPORTNAME}
 PORTVERSION=	3.23.46
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://www.kernelnotes.de/MySQL/Downloads/MySQL-3.23/ \
@@ -41,6 +41,12 @@ CONFIGURE_ARGS+=--with-charset=${WITH_CHARSET}
 CONFIGURE_ARGS+=--with-extra-charsets=${WITH_XCHARSET}
 .endif
 .endif
+.if defined(BUILD_STATIC)
+CONFIGURE_ARGS+=--with-mysqld-ldflags=--static
+.endif
+.if defined(BUILD_OPTIMIZED)
+CFLAGS+=	-mcpu=pentiumpro -O3 -fno-omit-frame-pointer
+.endif
 .if defined(WITH_LINUXTHREADS)
 CONFIGURE_ARGS+=--with-named-thread-libs='-DHAVE_GLIBC2_STYLE_GETHOSTBYNAME_R -D_THREAD_SAFE -I${LOCALBASE}/include/pthread/linuxthreads -L${LOCALBASE}/lib -llthread -llgcc_r'
 CFLAGS+=	-D__USE_UNIX98 -D_REENTRANT -D_THREAD_SAFE -I${LOCALBASE}/include/pthread/linuxthreads
@@ -49,6 +55,7 @@ LIB_DEPENDS+=	lthread.2:${PORTSDIR}/devel/linuxthreads
 CONFIGURE_ENV+=	PERL=${PERL} \
 		PERL5=${PERL} \
 		INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
+		CXX="${CC}" \
 		CFLAGS="${CFLAGS}" \
 		CONFIGURE_ARGS="${CONFIGURE_ARGS}"
 
@@ -86,6 +93,9 @@ pre-fetch:
 	@${ECHO} "				DNS check before inserting local hostname to"
 	@${ECHO} "				mysql database."
 	@${ECHO} "				Use if your machine has no offical DNS entry."
+	@${ECHO} "	BUILD_STATIC=yes	Build a static version of mysqld."
+	@${ECHO} "	BUILD_OPTIMIZED=yes	Add -mcpu=pentiumpro -O3 -fno-omit-frame-pointer"
+	@${ECHO} "				to CFLAGS."
 	@${ECHO} ""
 
 post-patch:
diff --git a/databases/mysql60-server/Makefile b/databases/mysql60-server/Makefile
index d2059df..77a17bc 100644
--- a/databases/mysql60-server/Makefile
+++ b/databases/mysql60-server/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME?=	${MASTERPORTNAME}
 PORTVERSION=	3.23.46
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://www.kernelnotes.de/MySQL/Downloads/MySQL-3.23/ \
@@ -41,6 +41,12 @@ CONFIGURE_ARGS+=--with-charset=${WITH_CHARSET}
 CONFIGURE_ARGS+=--with-extra-charsets=${WITH_XCHARSET}
 .endif
 .endif
+.if defined(BUILD_STATIC)
+CONFIGURE_ARGS+=--with-mysqld-ldflags=--static
+.endif
+.if defined(BUILD_OPTIMIZED)
+CFLAGS+=	-mcpu=pentiumpro -O3 -fno-omit-frame-pointer
+.endif
 .if defined(WITH_LINUXTHREADS)
 CONFIGURE_ARGS+=--with-named-thread-libs='-DHAVE_GLIBC2_STYLE_GETHOSTBYNAME_R -D_THREAD_SAFE -I${LOCALBASE}/include/pthread/linuxthreads -L${LOCALBASE}/lib -llthread -llgcc_r'
 CFLAGS+=	-D__USE_UNIX98 -D_REENTRANT -D_THREAD_SAFE -I${LOCALBASE}/include/pthread/linuxthreads
@@ -49,6 +55,7 @@ LIB_DEPENDS+=	lthread.2:${PORTSDIR}/devel/linuxthreads
 CONFIGURE_ENV+=	PERL=${PERL} \
 		PERL5=${PERL} \
 		INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
+		CXX="${CC}" \
 		CFLAGS="${CFLAGS}" \
 		CONFIGURE_ARGS="${CONFIGURE_ARGS}"
 
@@ -86,6 +93,9 @@ pre-fetch:
 	@${ECHO} "				DNS check before inserting local hostname to"
 	@${ECHO} "				mysql database."
 	@${ECHO} "				Use if your machine has no offical DNS entry."
+	@${ECHO} "	BUILD_STATIC=yes	Build a static version of mysqld."
+	@${ECHO} "	BUILD_OPTIMIZED=yes	Add -mcpu=pentiumpro -O3 -fno-omit-frame-pointer"
+	@${ECHO} "				to CFLAGS."
 	@${ECHO} ""
 
 post-patch:
diff --git a/databases/percona55-server/Makefile b/databases/percona55-server/Makefile
index d2059df..77a17bc 100644
--- a/databases/percona55-server/Makefile
+++ b/databases/percona55-server/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME?=	${MASTERPORTNAME}
 PORTVERSION=	3.23.46
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://www.kernelnotes.de/MySQL/Downloads/MySQL-3.23/ \
@@ -41,6 +41,12 @@ CONFIGURE_ARGS+=--with-charset=${WITH_CHARSET}
 CONFIGURE_ARGS+=--with-extra-charsets=${WITH_XCHARSET}
 .endif
 .endif
+.if defined(BUILD_STATIC)
+CONFIGURE_ARGS+=--with-mysqld-ldflags=--static
+.endif
+.if defined(BUILD_OPTIMIZED)
+CFLAGS+=	-mcpu=pentiumpro -O3 -fno-omit-frame-pointer
+.endif
 .if defined(WITH_LINUXTHREADS)
 CONFIGURE_ARGS+=--with-named-thread-libs='-DHAVE_GLIBC2_STYLE_GETHOSTBYNAME_R -D_THREAD_SAFE -I${LOCALBASE}/include/pthread/linuxthreads -L${LOCALBASE}/lib -llthread -llgcc_r'
 CFLAGS+=	-D__USE_UNIX98 -D_REENTRANT -D_THREAD_SAFE -I${LOCALBASE}/include/pthread/linuxthreads
@@ -49,6 +55,7 @@ LIB_DEPENDS+=	lthread.2:${PORTSDIR}/devel/linuxthreads
 CONFIGURE_ENV+=	PERL=${PERL} \
 		PERL5=${PERL} \
 		INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
+		CXX="${CC}" \
 		CFLAGS="${CFLAGS}" \
 		CONFIGURE_ARGS="${CONFIGURE_ARGS}"
 
@@ -86,6 +93,9 @@ pre-fetch:
 	@${ECHO} "				DNS check before inserting local hostname to"
 	@${ECHO} "				mysql database."
 	@${ECHO} "				Use if your machine has no offical DNS entry."
+	@${ECHO} "	BUILD_STATIC=yes	Build a static version of mysqld."
+	@${ECHO} "	BUILD_OPTIMIZED=yes	Add -mcpu=pentiumpro -O3 -fno-omit-frame-pointer"
+	@${ECHO} "				to CFLAGS."
 	@${ECHO} ""
 
 post-patch: