Add two new Makefile variables: SKIP_INSTALL_DB, INSTALL_DB_FORCE

(see Makefile for explanation).

9 files changed, 135 insertions, 9 deletions

diff --git a/databases/mysql323-server/Makefile b/databases/mysql323-server/Makefile
index 9755869e9919..59f677c63349 100644
--- a/databases/mysql323-server/Makefile
+++ b/databases/mysql323-server/Makefile
@@ -67,6 +67,14 @@ pre-fetch:
 	@${ECHO} "	WITH_XCHARSET=list	define other built-in charsets (may be 'all');"
 	@${ECHO} "	DB_DIR=directory	Set alternate directory for database files."
 	@${ECHO} "	WITH_LINUXTHREADS=yes	Use the linuxthreads pthread library."
+	@${ECHO} "	SKIP_INSTALL_DB=yes	Skip mysql_install_db"
+	@${ECHO} "				(i. e. leave ${DB_DIR} alone)."
+	@${ECHO} "				This is useful for upgrades."
+	@${ECHO} "				Be sure to know what you are doing!"
+	@${ECHO} "	INSTALL_DB_FORCE=yes	don't run resolveip to do some additional"
+	@${ECHO} "				DNS checks before inserting local hostname to"
+	@${ECHO} "				mysql database."
+	@${ECHO} "				Use if your machine has no offical DNS entry."
 	@${ECHO} ""
 
 # MySQL-Server part
@@ -79,8 +87,8 @@ post-patch:
 	${MV} ${WRKSRC}/strings/strings-x86.s ${WRKSRC}/strings/strings-x86.S
 	${MV} ${WRKSRC}/strings/longlong2str-x86.s ${WRKSRC}/strings/longlong2str-x86.S
 
+.if exists(${DB_DIR}) && !defined(PACKAGE_BUILDING) && !defined(OVERWRITE_DB) && !defined(SKIP_INSTALL_DB)
 pre-install:
-.if !defined(PACKAGE_BUILDING) && exists(${DB_DIR}) && !defined(OVERWRITE_DB)
 	@${ECHO} "You appear to already have a mysql database directory in ${DB_DIR}."
 	@${ECHO} ""
 	@${ECHO} "In order to preserve your existing data, you should:"
@@ -99,7 +107,13 @@ pre-install:
 
 post-install:
 .if !defined(PACKAGE_BUILDING)
+.if !defined(SKIP_INSTALL_DB)
+.if defined(INSTALL_DB_FORCE)
+	${PREFIX}/bin/mysql_install_db --force
+.else
 	${PREFIX}/bin/mysql_install_db
+.endif
+.endif
 	@${SETENV} DB_DIR=${DB_DIR} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 .endif
 	@${SED} "s|%%PREFIX%%|${PREFIX}|g" < ${FILESDIR}/mysql-server.sh > ${PREFIX}/etc/rc.d/mysql-server.sh
diff --git a/databases/mysql40-server/Makefile b/databases/mysql40-server/Makefile
index 9755869e9919..59f677c63349 100644
--- a/databases/mysql40-server/Makefile
+++ b/databases/mysql40-server/Makefile
@@ -67,6 +67,14 @@ pre-fetch:
 	@${ECHO} "	WITH_XCHARSET=list	define other built-in charsets (may be 'all');"
 	@${ECHO} "	DB_DIR=directory	Set alternate directory for database files."
 	@${ECHO} "	WITH_LINUXTHREADS=yes	Use the linuxthreads pthread library."
+	@${ECHO} "	SKIP_INSTALL_DB=yes	Skip mysql_install_db"
+	@${ECHO} "				(i. e. leave ${DB_DIR} alone)."
+	@${ECHO} "				This is useful for upgrades."
+	@${ECHO} "				Be sure to know what you are doing!"
+	@${ECHO} "	INSTALL_DB_FORCE=yes	don't run resolveip to do some additional"
+	@${ECHO} "				DNS checks before inserting local hostname to"
+	@${ECHO} "				mysql database."
+	@${ECHO} "				Use if your machine has no offical DNS entry."
 	@${ECHO} ""
 
 # MySQL-Server part
@@ -79,8 +87,8 @@ post-patch:
 	${MV} ${WRKSRC}/strings/strings-x86.s ${WRKSRC}/strings/strings-x86.S
 	${MV} ${WRKSRC}/strings/longlong2str-x86.s ${WRKSRC}/strings/longlong2str-x86.S
 
+.if exists(${DB_DIR}) && !defined(PACKAGE_BUILDING) && !defined(OVERWRITE_DB) && !defined(SKIP_INSTALL_DB)
 pre-install:
-.if !defined(PACKAGE_BUILDING) && exists(${DB_DIR}) && !defined(OVERWRITE_DB)
 	@${ECHO} "You appear to already have a mysql database directory in ${DB_DIR}."
 	@${ECHO} ""
 	@${ECHO} "In order to preserve your existing data, you should:"
@@ -99,7 +107,13 @@ pre-install:
 
 post-install:
 .if !defined(PACKAGE_BUILDING)
+.if !defined(SKIP_INSTALL_DB)
+.if defined(INSTALL_DB_FORCE)
+	${PREFIX}/bin/mysql_install_db --force
+.else
 	${PREFIX}/bin/mysql_install_db
+.endif
+.endif
 	@${SETENV} DB_DIR=${DB_DIR} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 .endif
 	@${SED} "s|%%PREFIX%%|${PREFIX}|g" < ${FILESDIR}/mysql-server.sh > ${PREFIX}/etc/rc.d/mysql-server.sh
diff --git a/databases/mysql41-server/Makefile b/databases/mysql41-server/Makefile
index 9755869e9919..59f677c63349 100644
--- a/databases/mysql41-server/Makefile
+++ b/databases/mysql41-server/Makefile
@@ -67,6 +67,14 @@ pre-fetch:
 	@${ECHO} "	WITH_XCHARSET=list	define other built-in charsets (may be 'all');"
 	@${ECHO} "	DB_DIR=directory	Set alternate directory for database files."
 	@${ECHO} "	WITH_LINUXTHREADS=yes	Use the linuxthreads pthread library."
+	@${ECHO} "	SKIP_INSTALL_DB=yes	Skip mysql_install_db"
+	@${ECHO} "				(i. e. leave ${DB_DIR} alone)."
+	@${ECHO} "				This is useful for upgrades."
+	@${ECHO} "				Be sure to know what you are doing!"
+	@${ECHO} "	INSTALL_DB_FORCE=yes	don't run resolveip to do some additional"
+	@${ECHO} "				DNS checks before inserting local hostname to"
+	@${ECHO} "				mysql database."
+	@${ECHO} "				Use if your machine has no offical DNS entry."
 	@${ECHO} ""
 
 # MySQL-Server part
@@ -79,8 +87,8 @@ post-patch:
 	${MV} ${WRKSRC}/strings/strings-x86.s ${WRKSRC}/strings/strings-x86.S
 	${MV} ${WRKSRC}/strings/longlong2str-x86.s ${WRKSRC}/strings/longlong2str-x86.S
 
+.if exists(${DB_DIR}) && !defined(PACKAGE_BUILDING) && !defined(OVERWRITE_DB) && !defined(SKIP_INSTALL_DB)
 pre-install:
-.if !defined(PACKAGE_BUILDING) && exists(${DB_DIR}) && !defined(OVERWRITE_DB)
 	@${ECHO} "You appear to already have a mysql database directory in ${DB_DIR}."
 	@${ECHO} ""
 	@${ECHO} "In order to preserve your existing data, you should:"
@@ -99,7 +107,13 @@ pre-install:
 
 post-install:
 .if !defined(PACKAGE_BUILDING)
+.if !defined(SKIP_INSTALL_DB)
+.if defined(INSTALL_DB_FORCE)
+	${PREFIX}/bin/mysql_install_db --force
+.else
 	${PREFIX}/bin/mysql_install_db
+.endif
+.endif
 	@${SETENV} DB_DIR=${DB_DIR} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 .endif
 	@${SED} "s|%%PREFIX%%|${PREFIX}|g" < ${FILESDIR}/mysql-server.sh > ${PREFIX}/etc/rc.d/mysql-server.sh
diff --git a/databases/mysql50-server/Makefile b/databases/mysql50-server/Makefile
index 9755869e9919..59f677c63349 100644
--- a/databases/mysql50-server/Makefile
+++ b/databases/mysql50-server/Makefile
@@ -67,6 +67,14 @@ pre-fetch:
 	@${ECHO} "	WITH_XCHARSET=list	define other built-in charsets (may be 'all');"
 	@${ECHO} "	DB_DIR=directory	Set alternate directory for database files."
 	@${ECHO} "	WITH_LINUXTHREADS=yes	Use the linuxthreads pthread library."
+	@${ECHO} "	SKIP_INSTALL_DB=yes	Skip mysql_install_db"
+	@${ECHO} "				(i. e. leave ${DB_DIR} alone)."
+	@${ECHO} "				This is useful for upgrades."
+	@${ECHO} "				Be sure to know what you are doing!"
+	@${ECHO} "	INSTALL_DB_FORCE=yes	don't run resolveip to do some additional"
+	@${ECHO} "				DNS checks before inserting local hostname to"
+	@${ECHO} "				mysql database."
+	@${ECHO} "				Use if your machine has no offical DNS entry."
 	@${ECHO} ""
 
 # MySQL-Server part
@@ -79,8 +87,8 @@ post-patch:
 	${MV} ${WRKSRC}/strings/strings-x86.s ${WRKSRC}/strings/strings-x86.S
 	${MV} ${WRKSRC}/strings/longlong2str-x86.s ${WRKSRC}/strings/longlong2str-x86.S
 
+.if exists(${DB_DIR}) && !defined(PACKAGE_BUILDING) && !defined(OVERWRITE_DB) && !defined(SKIP_INSTALL_DB)
 pre-install:
-.if !defined(PACKAGE_BUILDING) && exists(${DB_DIR}) && !defined(OVERWRITE_DB)
 	@${ECHO} "You appear to already have a mysql database directory in ${DB_DIR}."
 	@${ECHO} ""
 	@${ECHO} "In order to preserve your existing data, you should:"
@@ -99,7 +107,13 @@ pre-install:
 
 post-install:
 .if !defined(PACKAGE_BUILDING)
+.if !defined(SKIP_INSTALL_DB)
+.if defined(INSTALL_DB_FORCE)
+	${PREFIX}/bin/mysql_install_db --force
+.else
 	${PREFIX}/bin/mysql_install_db
+.endif
+.endif
 	@${SETENV} DB_DIR=${DB_DIR} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 .endif
 	@${SED} "s|%%PREFIX%%|${PREFIX}|g" < ${FILESDIR}/mysql-server.sh > ${PREFIX}/etc/rc.d/mysql-server.sh
diff --git a/databases/mysql51-server/Makefile b/databases/mysql51-server/Makefile
index 9755869e9919..59f677c63349 100644
--- a/databases/mysql51-server/Makefile
+++ b/databases/mysql51-server/Makefile
@@ -67,6 +67,14 @@ pre-fetch:
 	@${ECHO} "	WITH_XCHARSET=list	define other built-in charsets (may be 'all');"
 	@${ECHO} "	DB_DIR=directory	Set alternate directory for database files."
 	@${ECHO} "	WITH_LINUXTHREADS=yes	Use the linuxthreads pthread library."
+	@${ECHO} "	SKIP_INSTALL_DB=yes	Skip mysql_install_db"
+	@${ECHO} "				(i. e. leave ${DB_DIR} alone)."
+	@${ECHO} "				This is useful for upgrades."
+	@${ECHO} "				Be sure to know what you are doing!"
+	@${ECHO} "	INSTALL_DB_FORCE=yes	don't run resolveip to do some additional"
+	@${ECHO} "				DNS checks before inserting local hostname to"
+	@${ECHO} "				mysql database."
+	@${ECHO} "				Use if your machine has no offical DNS entry."
 	@${ECHO} ""
 
 # MySQL-Server part
@@ -79,8 +87,8 @@ post-patch:
 	${MV} ${WRKSRC}/strings/strings-x86.s ${WRKSRC}/strings/strings-x86.S
 	${MV} ${WRKSRC}/strings/longlong2str-x86.s ${WRKSRC}/strings/longlong2str-x86.S
 
+.if exists(${DB_DIR}) && !defined(PACKAGE_BUILDING) && !defined(OVERWRITE_DB) && !defined(SKIP_INSTALL_DB)
 pre-install:
-.if !defined(PACKAGE_BUILDING) && exists(${DB_DIR}) && !defined(OVERWRITE_DB)
 	@${ECHO} "You appear to already have a mysql database directory in ${DB_DIR}."
 	@${ECHO} ""
 	@${ECHO} "In order to preserve your existing data, you should:"
@@ -99,7 +107,13 @@ pre-install:
 
 post-install:
 .if !defined(PACKAGE_BUILDING)
+.if !defined(SKIP_INSTALL_DB)
+.if defined(INSTALL_DB_FORCE)
+	${PREFIX}/bin/mysql_install_db --force
+.else
 	${PREFIX}/bin/mysql_install_db
+.endif
+.endif
 	@${SETENV} DB_DIR=${DB_DIR} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 .endif
 	@${SED} "s|%%PREFIX%%|${PREFIX}|g" < ${FILESDIR}/mysql-server.sh > ${PREFIX}/etc/rc.d/mysql-server.sh
diff --git a/databases/mysql54-server/Makefile b/databases/mysql54-server/Makefile
index 9755869e9919..59f677c63349 100644
--- a/databases/mysql54-server/Makefile
+++ b/databases/mysql54-server/Makefile
@@ -67,6 +67,14 @@ pre-fetch:
 	@${ECHO} "	WITH_XCHARSET=list	define other built-in charsets (may be 'all');"
 	@${ECHO} "	DB_DIR=directory	Set alternate directory for database files."
 	@${ECHO} "	WITH_LINUXTHREADS=yes	Use the linuxthreads pthread library."
+	@${ECHO} "	SKIP_INSTALL_DB=yes	Skip mysql_install_db"
+	@${ECHO} "				(i. e. leave ${DB_DIR} alone)."
+	@${ECHO} "				This is useful for upgrades."
+	@${ECHO} "				Be sure to know what you are doing!"
+	@${ECHO} "	INSTALL_DB_FORCE=yes	don't run resolveip to do some additional"
+	@${ECHO} "				DNS checks before inserting local hostname to"
+	@${ECHO} "				mysql database."
+	@${ECHO} "				Use if your machine has no offical DNS entry."
 	@${ECHO} ""
 
 # MySQL-Server part
@@ -79,8 +87,8 @@ post-patch:
 	${MV} ${WRKSRC}/strings/strings-x86.s ${WRKSRC}/strings/strings-x86.S
 	${MV} ${WRKSRC}/strings/longlong2str-x86.s ${WRKSRC}/strings/longlong2str-x86.S
 
+.if exists(${DB_DIR}) && !defined(PACKAGE_BUILDING) && !defined(OVERWRITE_DB) && !defined(SKIP_INSTALL_DB)
 pre-install:
-.if !defined(PACKAGE_BUILDING) && exists(${DB_DIR}) && !defined(OVERWRITE_DB)
 	@${ECHO} "You appear to already have a mysql database directory in ${DB_DIR}."
 	@${ECHO} ""
 	@${ECHO} "In order to preserve your existing data, you should:"
@@ -99,7 +107,13 @@ pre-install:
 
 post-install:
 .if !defined(PACKAGE_BUILDING)
+.if !defined(SKIP_INSTALL_DB)
+.if defined(INSTALL_DB_FORCE)
+	${PREFIX}/bin/mysql_install_db --force
+.else
 	${PREFIX}/bin/mysql_install_db
+.endif
+.endif
 	@${SETENV} DB_DIR=${DB_DIR} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 .endif
 	@${SED} "s|%%PREFIX%%|${PREFIX}|g" < ${FILESDIR}/mysql-server.sh > ${PREFIX}/etc/rc.d/mysql-server.sh
diff --git a/databases/mysql55-server/Makefile b/databases/mysql55-server/Makefile
index 9755869e9919..59f677c63349 100644
--- a/databases/mysql55-server/Makefile
+++ b/databases/mysql55-server/Makefile
@@ -67,6 +67,14 @@ pre-fetch:
 	@${ECHO} "	WITH_XCHARSET=list	define other built-in charsets (may be 'all');"
 	@${ECHO} "	DB_DIR=directory	Set alternate directory for database files."
 	@${ECHO} "	WITH_LINUXTHREADS=yes	Use the linuxthreads pthread library."
+	@${ECHO} "	SKIP_INSTALL_DB=yes	Skip mysql_install_db"
+	@${ECHO} "				(i. e. leave ${DB_DIR} alone)."
+	@${ECHO} "				This is useful for upgrades."
+	@${ECHO} "				Be sure to know what you are doing!"
+	@${ECHO} "	INSTALL_DB_FORCE=yes	don't run resolveip to do some additional"
+	@${ECHO} "				DNS checks before inserting local hostname to"
+	@${ECHO} "				mysql database."
+	@${ECHO} "				Use if your machine has no offical DNS entry."
 	@${ECHO} ""
 
 # MySQL-Server part
@@ -79,8 +87,8 @@ post-patch:
 	${MV} ${WRKSRC}/strings/strings-x86.s ${WRKSRC}/strings/strings-x86.S
 	${MV} ${WRKSRC}/strings/longlong2str-x86.s ${WRKSRC}/strings/longlong2str-x86.S
 
+.if exists(${DB_DIR}) && !defined(PACKAGE_BUILDING) && !defined(OVERWRITE_DB) && !defined(SKIP_INSTALL_DB)
 pre-install:
-.if !defined(PACKAGE_BUILDING) && exists(${DB_DIR}) && !defined(OVERWRITE_DB)
 	@${ECHO} "You appear to already have a mysql database directory in ${DB_DIR}."
 	@${ECHO} ""
 	@${ECHO} "In order to preserve your existing data, you should:"
@@ -99,7 +107,13 @@ pre-install:
 
 post-install:
 .if !defined(PACKAGE_BUILDING)
+.if !defined(SKIP_INSTALL_DB)
+.if defined(INSTALL_DB_FORCE)
+	${PREFIX}/bin/mysql_install_db --force
+.else
 	${PREFIX}/bin/mysql_install_db
+.endif
+.endif
 	@${SETENV} DB_DIR=${DB_DIR} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 .endif
 	@${SED} "s|%%PREFIX%%|${PREFIX}|g" < ${FILESDIR}/mysql-server.sh > ${PREFIX}/etc/rc.d/mysql-server.sh
diff --git a/databases/mysql60-server/Makefile b/databases/mysql60-server/Makefile
index 9755869e9919..59f677c63349 100644
--- a/databases/mysql60-server/Makefile
+++ b/databases/mysql60-server/Makefile
@@ -67,6 +67,14 @@ pre-fetch:
 	@${ECHO} "	WITH_XCHARSET=list	define other built-in charsets (may be 'all');"
 	@${ECHO} "	DB_DIR=directory	Set alternate directory for database files."
 	@${ECHO} "	WITH_LINUXTHREADS=yes	Use the linuxthreads pthread library."
+	@${ECHO} "	SKIP_INSTALL_DB=yes	Skip mysql_install_db"
+	@${ECHO} "				(i. e. leave ${DB_DIR} alone)."
+	@${ECHO} "				This is useful for upgrades."
+	@${ECHO} "				Be sure to know what you are doing!"
+	@${ECHO} "	INSTALL_DB_FORCE=yes	don't run resolveip to do some additional"
+	@${ECHO} "				DNS checks before inserting local hostname to"
+	@${ECHO} "				mysql database."
+	@${ECHO} "				Use if your machine has no offical DNS entry."
 	@${ECHO} ""
 
 # MySQL-Server part
@@ -79,8 +87,8 @@ post-patch:
 	${MV} ${WRKSRC}/strings/strings-x86.s ${WRKSRC}/strings/strings-x86.S
 	${MV} ${WRKSRC}/strings/longlong2str-x86.s ${WRKSRC}/strings/longlong2str-x86.S
 
+.if exists(${DB_DIR}) && !defined(PACKAGE_BUILDING) && !defined(OVERWRITE_DB) && !defined(SKIP_INSTALL_DB)
 pre-install:
-.if !defined(PACKAGE_BUILDING) && exists(${DB_DIR}) && !defined(OVERWRITE_DB)
 	@${ECHO} "You appear to already have a mysql database directory in ${DB_DIR}."
 	@${ECHO} ""
 	@${ECHO} "In order to preserve your existing data, you should:"
@@ -99,7 +107,13 @@ pre-install:
 
 post-install:
 .if !defined(PACKAGE_BUILDING)
+.if !defined(SKIP_INSTALL_DB)
+.if defined(INSTALL_DB_FORCE)
+	${PREFIX}/bin/mysql_install_db --force
+.else
 	${PREFIX}/bin/mysql_install_db
+.endif
+.endif
 	@${SETENV} DB_DIR=${DB_DIR} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 .endif
 	@${SED} "s|%%PREFIX%%|${PREFIX}|g" < ${FILESDIR}/mysql-server.sh > ${PREFIX}/etc/rc.d/mysql-server.sh
diff --git a/databases/percona55-server/Makefile b/databases/percona55-server/Makefile
index 9755869e9919..59f677c63349 100644
--- a/databases/percona55-server/Makefile
+++ b/databases/percona55-server/Makefile
@@ -67,6 +67,14 @@ pre-fetch:
 	@${ECHO} "	WITH_XCHARSET=list	define other built-in charsets (may be 'all');"
 	@${ECHO} "	DB_DIR=directory	Set alternate directory for database files."
 	@${ECHO} "	WITH_LINUXTHREADS=yes	Use the linuxthreads pthread library."
+	@${ECHO} "	SKIP_INSTALL_DB=yes	Skip mysql_install_db"
+	@${ECHO} "				(i. e. leave ${DB_DIR} alone)."
+	@${ECHO} "				This is useful for upgrades."
+	@${ECHO} "				Be sure to know what you are doing!"
+	@${ECHO} "	INSTALL_DB_FORCE=yes	don't run resolveip to do some additional"
+	@${ECHO} "				DNS checks before inserting local hostname to"
+	@${ECHO} "				mysql database."
+	@${ECHO} "				Use if your machine has no offical DNS entry."
 	@${ECHO} ""
 
 # MySQL-Server part
@@ -79,8 +87,8 @@ post-patch:
 	${MV} ${WRKSRC}/strings/strings-x86.s ${WRKSRC}/strings/strings-x86.S
 	${MV} ${WRKSRC}/strings/longlong2str-x86.s ${WRKSRC}/strings/longlong2str-x86.S
 
+.if exists(${DB_DIR}) && !defined(PACKAGE_BUILDING) && !defined(OVERWRITE_DB) && !defined(SKIP_INSTALL_DB)
 pre-install:
-.if !defined(PACKAGE_BUILDING) && exists(${DB_DIR}) && !defined(OVERWRITE_DB)
 	@${ECHO} "You appear to already have a mysql database directory in ${DB_DIR}."
 	@${ECHO} ""
 	@${ECHO} "In order to preserve your existing data, you should:"
@@ -99,7 +107,13 @@ pre-install:
 
 post-install:
 .if !defined(PACKAGE_BUILDING)
+.if !defined(SKIP_INSTALL_DB)
+.if defined(INSTALL_DB_FORCE)
+	${PREFIX}/bin/mysql_install_db --force
+.else
 	${PREFIX}/bin/mysql_install_db
+.endif
+.endif
 	@${SETENV} DB_DIR=${DB_DIR} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 .endif
 	@${SED} "s|%%PREFIX%%|${PREFIX}|g" < ${FILESDIR}/mysql-server.sh > ${PREFIX}/etc/rc.d/mysql-server.sh