diff options
| author | Alex Dupre <ale@FreeBSD.org> | 2004-03-12 10:27:34 +0000 |
|---|---|---|
| committer | Alex Dupre <ale@FreeBSD.org> | 2004-03-12 10:27:34 +0000 |
| commit | e5ba38231eb28fd7fbb7420ef5e6113b177efaef (patch) | |
| tree | d46a0da55ced04c83c0fcc37d4a6dfc9004c3b81 /databases/mysql40-server/Makefile | |
| parent | - Fix hack(1) running (diff) | |
Fix a never-catched bug in mysql_install_db script.
Now the SKIP_DNS_CHECK knob is pointless.
Notes
Notes:
svn path=/head/; revision=103762
Diffstat (limited to 'databases/mysql40-server/Makefile')
| -rw-r--r-- | databases/mysql40-server/Makefile | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/databases/mysql40-server/Makefile b/databases/mysql40-server/Makefile index 13098781b4a8..2d864c32fae4 100644 --- a/databases/mysql40-server/Makefile +++ b/databases/mysql40-server/Makefile @@ -129,10 +129,6 @@ pre-fetch: @${ECHO} " (default is /var/db/mysql)." @${ECHO} " WITH_LINUXTHREADS=yes Use the linuxthreads pthread library." @${ECHO} " OVERWRITE_DB=yes Re-initialize default databases." - @${ECHO} " SKIP_DNS_CHECK=yes Don't run resolveip to do an additional DNS" - @${ECHO} " reverse lookup before inserting local" - @${ECHO} " hostname into mysql database" - @${ECHO} " (use it if your machine has no official DNS entry)." @${ECHO} " BUILD_OPTIMIZED=yes Enable compiler optimizations" @${ECHO} " (use it if you need speed)." @${ECHO} " BUILD_STATIC=yes Build a static version of mysqld." @@ -160,12 +156,8 @@ post-install: @${RM} -r ${DB_DIR}/mysql ${DB_DIR}/test 2>/dev/null || true .endif .if !exists(${DB_DIR}) || (defined(OVERWRITE_DB) && ${OVERWRITE_DB:L} != "no") -.if defined(SKIP_DNS_CHECK) - ${PREFIX}/bin/mysql_install_db --force --ldata=${DB_DIR} -.else ${PREFIX}/bin/mysql_install_db --ldata=${DB_DIR} .endif -.endif @${SETENV} DB_DIR=${DB_DIR} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .endif @${SED} "s|%%PREFIX%%|${PREFIX}|g; s|%%DB_DIR%%|${DB_DIR}|g" < ${FILESDIR}/mysql-server.sh > ${PREFIX}/etc/rc.d/mysql-server.sh |