- remove -fno-omit-frame-pointer from CFLAGS if BUILD_OPTIMIZED is set

- add a warning for BUILD_OPTIMIZED

9 files changed, 63 insertions, 36 deletions

diff --git a/databases/mysql323-server/Makefile b/databases/mysql323-server/Makefile
index 77a17bc18dd1..accf7d08e176 100644
--- a/databases/mysql323-server/Makefile
+++ b/databases/mysql323-server/Makefile
@@ -31,7 +31,9 @@ CONFIGURE_ARGS=	--localstatedir=${DB_DIR} \
 		--without-bench \
 		--with-mit-threads=no \
 		--with-libwrap \
-		--with-low-memory
+		--with-low-memory \
+		--with-comment='FreeBSD port: ${PKGNAME}'
+
 .if ${MACHINE_ARCH} == "i386"
 CONFIGURE_ARGS+=--enable-assembler --with-berkeley-db
 .endif
@@ -45,7 +47,7 @@ CONFIGURE_ARGS+=--with-extra-charsets=${WITH_XCHARSET}
 CONFIGURE_ARGS+=--with-mysqld-ldflags=--static
 .endif
 .if defined(BUILD_OPTIMIZED)
-CFLAGS+=	-mcpu=pentiumpro -O3 -fno-omit-frame-pointer
+CFLAGS+=	-mcpu=pentiumpro -O3
 .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'
@@ -94,8 +96,9 @@ pre-fetch:
 	@${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} "	BUILD_OPTIMIZED=yes	Add -mcpu=pentiumpro -O3 to CFLAGS."
+	@${ECHO} "				This setting may produce broken code and thus"
+	@${ECHO} "				is not recommended for production servers."
 	@${ECHO} ""
 
 post-patch:
diff --git a/databases/mysql40-server/Makefile b/databases/mysql40-server/Makefile
index 77a17bc18dd1..accf7d08e176 100644
--- a/databases/mysql40-server/Makefile
+++ b/databases/mysql40-server/Makefile
@@ -31,7 +31,9 @@ CONFIGURE_ARGS=	--localstatedir=${DB_DIR} \
 		--without-bench \
 		--with-mit-threads=no \
 		--with-libwrap \
-		--with-low-memory
+		--with-low-memory \
+		--with-comment='FreeBSD port: ${PKGNAME}'
+
 .if ${MACHINE_ARCH} == "i386"
 CONFIGURE_ARGS+=--enable-assembler --with-berkeley-db
 .endif
@@ -45,7 +47,7 @@ CONFIGURE_ARGS+=--with-extra-charsets=${WITH_XCHARSET}
 CONFIGURE_ARGS+=--with-mysqld-ldflags=--static
 .endif
 .if defined(BUILD_OPTIMIZED)
-CFLAGS+=	-mcpu=pentiumpro -O3 -fno-omit-frame-pointer
+CFLAGS+=	-mcpu=pentiumpro -O3
 .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'
@@ -94,8 +96,9 @@ pre-fetch:
 	@${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} "	BUILD_OPTIMIZED=yes	Add -mcpu=pentiumpro -O3 to CFLAGS."
+	@${ECHO} "				This setting may produce broken code and thus"
+	@${ECHO} "				is not recommended for production servers."
 	@${ECHO} ""
 
 post-patch:
diff --git a/databases/mysql41-server/Makefile b/databases/mysql41-server/Makefile
index 77a17bc18dd1..accf7d08e176 100644
--- a/databases/mysql41-server/Makefile
+++ b/databases/mysql41-server/Makefile
@@ -31,7 +31,9 @@ CONFIGURE_ARGS=	--localstatedir=${DB_DIR} \
 		--without-bench \
 		--with-mit-threads=no \
 		--with-libwrap \
-		--with-low-memory
+		--with-low-memory \
+		--with-comment='FreeBSD port: ${PKGNAME}'
+
 .if ${MACHINE_ARCH} == "i386"
 CONFIGURE_ARGS+=--enable-assembler --with-berkeley-db
 .endif
@@ -45,7 +47,7 @@ CONFIGURE_ARGS+=--with-extra-charsets=${WITH_XCHARSET}
 CONFIGURE_ARGS+=--with-mysqld-ldflags=--static
 .endif
 .if defined(BUILD_OPTIMIZED)
-CFLAGS+=	-mcpu=pentiumpro -O3 -fno-omit-frame-pointer
+CFLAGS+=	-mcpu=pentiumpro -O3
 .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'
@@ -94,8 +96,9 @@ pre-fetch:
 	@${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} "	BUILD_OPTIMIZED=yes	Add -mcpu=pentiumpro -O3 to CFLAGS."
+	@${ECHO} "				This setting may produce broken code and thus"
+	@${ECHO} "				is not recommended for production servers."
 	@${ECHO} ""
 
 post-patch:
diff --git a/databases/mysql50-server/Makefile b/databases/mysql50-server/Makefile
index 77a17bc18dd1..accf7d08e176 100644
--- a/databases/mysql50-server/Makefile
+++ b/databases/mysql50-server/Makefile
@@ -31,7 +31,9 @@ CONFIGURE_ARGS=	--localstatedir=${DB_DIR} \
 		--without-bench \
 		--with-mit-threads=no \
 		--with-libwrap \
-		--with-low-memory
+		--with-low-memory \
+		--with-comment='FreeBSD port: ${PKGNAME}'
+
 .if ${MACHINE_ARCH} == "i386"
 CONFIGURE_ARGS+=--enable-assembler --with-berkeley-db
 .endif
@@ -45,7 +47,7 @@ CONFIGURE_ARGS+=--with-extra-charsets=${WITH_XCHARSET}
 CONFIGURE_ARGS+=--with-mysqld-ldflags=--static
 .endif
 .if defined(BUILD_OPTIMIZED)
-CFLAGS+=	-mcpu=pentiumpro -O3 -fno-omit-frame-pointer
+CFLAGS+=	-mcpu=pentiumpro -O3
 .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'
@@ -94,8 +96,9 @@ pre-fetch:
 	@${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} "	BUILD_OPTIMIZED=yes	Add -mcpu=pentiumpro -O3 to CFLAGS."
+	@${ECHO} "				This setting may produce broken code and thus"
+	@${ECHO} "				is not recommended for production servers."
 	@${ECHO} ""
 
 post-patch:
diff --git a/databases/mysql51-server/Makefile b/databases/mysql51-server/Makefile
index 77a17bc18dd1..accf7d08e176 100644
--- a/databases/mysql51-server/Makefile
+++ b/databases/mysql51-server/Makefile
@@ -31,7 +31,9 @@ CONFIGURE_ARGS=	--localstatedir=${DB_DIR} \
 		--without-bench \
 		--with-mit-threads=no \
 		--with-libwrap \
-		--with-low-memory
+		--with-low-memory \
+		--with-comment='FreeBSD port: ${PKGNAME}'
+
 .if ${MACHINE_ARCH} == "i386"
 CONFIGURE_ARGS+=--enable-assembler --with-berkeley-db
 .endif
@@ -45,7 +47,7 @@ CONFIGURE_ARGS+=--with-extra-charsets=${WITH_XCHARSET}
 CONFIGURE_ARGS+=--with-mysqld-ldflags=--static
 .endif
 .if defined(BUILD_OPTIMIZED)
-CFLAGS+=	-mcpu=pentiumpro -O3 -fno-omit-frame-pointer
+CFLAGS+=	-mcpu=pentiumpro -O3
 .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'
@@ -94,8 +96,9 @@ pre-fetch:
 	@${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} "	BUILD_OPTIMIZED=yes	Add -mcpu=pentiumpro -O3 to CFLAGS."
+	@${ECHO} "				This setting may produce broken code and thus"
+	@${ECHO} "				is not recommended for production servers."
 	@${ECHO} ""
 
 post-patch:
diff --git a/databases/mysql54-server/Makefile b/databases/mysql54-server/Makefile
index 77a17bc18dd1..accf7d08e176 100644
--- a/databases/mysql54-server/Makefile
+++ b/databases/mysql54-server/Makefile
@@ -31,7 +31,9 @@ CONFIGURE_ARGS=	--localstatedir=${DB_DIR} \
 		--without-bench \
 		--with-mit-threads=no \
 		--with-libwrap \
-		--with-low-memory
+		--with-low-memory \
+		--with-comment='FreeBSD port: ${PKGNAME}'
+
 .if ${MACHINE_ARCH} == "i386"
 CONFIGURE_ARGS+=--enable-assembler --with-berkeley-db
 .endif
@@ -45,7 +47,7 @@ CONFIGURE_ARGS+=--with-extra-charsets=${WITH_XCHARSET}
 CONFIGURE_ARGS+=--with-mysqld-ldflags=--static
 .endif
 .if defined(BUILD_OPTIMIZED)
-CFLAGS+=	-mcpu=pentiumpro -O3 -fno-omit-frame-pointer
+CFLAGS+=	-mcpu=pentiumpro -O3
 .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'
@@ -94,8 +96,9 @@ pre-fetch:
 	@${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} "	BUILD_OPTIMIZED=yes	Add -mcpu=pentiumpro -O3 to CFLAGS."
+	@${ECHO} "				This setting may produce broken code and thus"
+	@${ECHO} "				is not recommended for production servers."
 	@${ECHO} ""
 
 post-patch:
diff --git a/databases/mysql55-server/Makefile b/databases/mysql55-server/Makefile
index 77a17bc18dd1..accf7d08e176 100644
--- a/databases/mysql55-server/Makefile
+++ b/databases/mysql55-server/Makefile
@@ -31,7 +31,9 @@ CONFIGURE_ARGS=	--localstatedir=${DB_DIR} \
 		--without-bench \
 		--with-mit-threads=no \
 		--with-libwrap \
-		--with-low-memory
+		--with-low-memory \
+		--with-comment='FreeBSD port: ${PKGNAME}'
+
 .if ${MACHINE_ARCH} == "i386"
 CONFIGURE_ARGS+=--enable-assembler --with-berkeley-db
 .endif
@@ -45,7 +47,7 @@ CONFIGURE_ARGS+=--with-extra-charsets=${WITH_XCHARSET}
 CONFIGURE_ARGS+=--with-mysqld-ldflags=--static
 .endif
 .if defined(BUILD_OPTIMIZED)
-CFLAGS+=	-mcpu=pentiumpro -O3 -fno-omit-frame-pointer
+CFLAGS+=	-mcpu=pentiumpro -O3
 .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'
@@ -94,8 +96,9 @@ pre-fetch:
 	@${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} "	BUILD_OPTIMIZED=yes	Add -mcpu=pentiumpro -O3 to CFLAGS."
+	@${ECHO} "				This setting may produce broken code and thus"
+	@${ECHO} "				is not recommended for production servers."
 	@${ECHO} ""
 
 post-patch:
diff --git a/databases/mysql60-server/Makefile b/databases/mysql60-server/Makefile
index 77a17bc18dd1..accf7d08e176 100644
--- a/databases/mysql60-server/Makefile
+++ b/databases/mysql60-server/Makefile
@@ -31,7 +31,9 @@ CONFIGURE_ARGS=	--localstatedir=${DB_DIR} \
 		--without-bench \
 		--with-mit-threads=no \
 		--with-libwrap \
-		--with-low-memory
+		--with-low-memory \
+		--with-comment='FreeBSD port: ${PKGNAME}'
+
 .if ${MACHINE_ARCH} == "i386"
 CONFIGURE_ARGS+=--enable-assembler --with-berkeley-db
 .endif
@@ -45,7 +47,7 @@ CONFIGURE_ARGS+=--with-extra-charsets=${WITH_XCHARSET}
 CONFIGURE_ARGS+=--with-mysqld-ldflags=--static
 .endif
 .if defined(BUILD_OPTIMIZED)
-CFLAGS+=	-mcpu=pentiumpro -O3 -fno-omit-frame-pointer
+CFLAGS+=	-mcpu=pentiumpro -O3
 .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'
@@ -94,8 +96,9 @@ pre-fetch:
 	@${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} "	BUILD_OPTIMIZED=yes	Add -mcpu=pentiumpro -O3 to CFLAGS."
+	@${ECHO} "				This setting may produce broken code and thus"
+	@${ECHO} "				is not recommended for production servers."
 	@${ECHO} ""
 
 post-patch:
diff --git a/databases/percona55-server/Makefile b/databases/percona55-server/Makefile
index 77a17bc18dd1..accf7d08e176 100644
--- a/databases/percona55-server/Makefile
+++ b/databases/percona55-server/Makefile
@@ -31,7 +31,9 @@ CONFIGURE_ARGS=	--localstatedir=${DB_DIR} \
 		--without-bench \
 		--with-mit-threads=no \
 		--with-libwrap \
-		--with-low-memory
+		--with-low-memory \
+		--with-comment='FreeBSD port: ${PKGNAME}'
+
 .if ${MACHINE_ARCH} == "i386"
 CONFIGURE_ARGS+=--enable-assembler --with-berkeley-db
 .endif
@@ -45,7 +47,7 @@ CONFIGURE_ARGS+=--with-extra-charsets=${WITH_XCHARSET}
 CONFIGURE_ARGS+=--with-mysqld-ldflags=--static
 .endif
 .if defined(BUILD_OPTIMIZED)
-CFLAGS+=	-mcpu=pentiumpro -O3 -fno-omit-frame-pointer
+CFLAGS+=	-mcpu=pentiumpro -O3
 .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'
@@ -94,8 +96,9 @@ pre-fetch:
 	@${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} "	BUILD_OPTIMIZED=yes	Add -mcpu=pentiumpro -O3 to CFLAGS."
+	@${ECHO} "				This setting may produce broken code and thus"
+	@${ECHO} "				is not recommended for production servers."
 	@${ECHO} ""
 
 post-patch: