Attachment 35102 Details for Bug 56775 – file.diff

[patch] file.diff

file.diff (text/plain), 4.00 KB, created by tkato on 2003-09-14 07:50:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato

Created: 2003-09-14 07:50:25 UTC

Size: 4.00 KB

patch

obsolete

>diff -urN /usr/ports/databases/mysql323-server/Makefile databases/mysql323-server/Makefile
>--- /usr/ports/databases/mysql323-server/Makefile	Sat Aug 30 13:01:40 2003
>+++ databases/mysql323-server/Makefile	Sun Sep 14 13:21:31 2003
>@@ -96,44 +96,44 @@
> 
> ONLY_FOR_ARCHS=	i386 alpha sparc64
> 
>-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} "				(default is /var/db/mysql)."
>-	@${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} "	SKIP_DNS_CHECK=yes	don't run resolveip to do an additional"
>-	@${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 to CFLAGS."
>-	@${ECHO} "				This setting may produce broken code and thus"
>-	@${ECHO} "				is not recommended for production servers."
>-	@${ECHO} ""
>+pre-everything::
>+	@${ECHO_MSG} ""
>+	@${ECHO_MSG} "You may use the following build options:"
>+	@${ECHO_MSG} ""
>+	@${ECHO_MSG} "	WITH_CHARSET=charset	define the primary built-in charset (latin1);"
>+	@${ECHO_MSG} "	WITH_XCHARSET=list	define other built-in charsets (may be 'all');"
>+	@${ECHO_MSG} "	DB_DIR=directory	Set alternate directory for database files"
>+	@${ECHO_MSG} "				(default is /var/db/mysql)."
>+	@${ECHO_MSG} "	WITH_LINUXTHREADS=yes	Use the linuxthreads pthread library."
>+	@${ECHO_MSG} "	SKIP_INSTALL_DB=yes	Skip mysql_install_db"
>+	@${ECHO_MSG} "				(i. e. leave ${DB_DIR} alone)."
>+	@${ECHO_MSG} "				This is useful for upgrades."
>+	@${ECHO_MSG} "				Be sure to know what you are doing!"
>+	@${ECHO_MSG} "	SKIP_DNS_CHECK=yes	don't run resolveip to do an additional"
>+	@${ECHO_MSG} "				DNS check before inserting local hostname to"
>+	@${ECHO_MSG} "				mysql database."
>+	@${ECHO_MSG} "				Use if your machine has no offical DNS entry."
>+	@${ECHO_MSG} "	BUILD_STATIC=yes	Build a static version of mysqld."
>+	@${ECHO_MSG} "	BUILD_OPTIMIZED=yes	Add -mcpu=pentiumpro -O3 to CFLAGS."
>+	@${ECHO_MSG} "				This setting may produce broken code and thus"
>+	@${ECHO_MSG} "				is not recommended for production servers."
>+	@${ECHO_MSG} ""
> 
> .if exists(${DB_DIR}) && !defined(PACKAGE_BUILDING) && !defined(OVERWRITE_DB) && !defined(SKIP_INSTALL_DB)
> pre-install:
>-	@${ECHO} "You appear to already have a mysql database directory in ${DB_DIR}."
>-	@${ECHO} ""
>-	@${ECHO} "In order to preserve your existing data, you should:"
>-	@${ECHO} "	- dump all your databases"
>-	@${ECHO} "	- kill mysql if it is running"
>-	@${ECHO} "	- delete the ${DB_DIR} directory"
>-	@${ECHO} "	- run 'make install'"
>-	@${ECHO} "	- start up mysql"
>-	@${ECHO} "	- re-create all of your database"
>-	@${ECHO} "	- re-load your data"
>-	@${ECHO} ""
>-	@${ECHO} "If you understand the consequences of this upgrade, please re-build this"
>-	@${ECHO} "port with the environment variable OVERWRITE_DB defined."
>+	@${ECHO_MSG} "You appear to already have a mysql database directory in ${DB_DIR}."
>+	@${ECHO_MSG} ""
>+	@${ECHO_MSG} "In order to preserve your existing data, you should:"
>+	@${ECHO_MSG} "	- dump all your databases"
>+	@${ECHO_MSG} "	- kill mysql if it is running"
>+	@${ECHO_MSG} "	- delete the ${DB_DIR} directory"
>+	@${ECHO_MSG} "	- run 'make install'"
>+	@${ECHO_MSG} "	- start up mysql"
>+	@${ECHO_MSG} "	- re-create all of your database"
>+	@${ECHO_MSG} "	- re-load your data"
>+	@${ECHO_MSG} ""
>+	@${ECHO_MSG} "If you understand the consequences of this upgrade, please re-build this"
>+	@${ECHO_MSG} "port with the environment variable OVERWRITE_DB defined."
> 	@${FALSE}
> .endif

Actions: View | Diff

Attachments on bug 56775: 35102