Attachment 85643 Details for Bug 121900 – file.diff

[patch] file.diff

file.diff (text/plain), 2.72 KB, created by Yarema on 2008-03-20 07:40:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yarema

Created: 2008-03-20 07:40:01 UTC

Size: 2.72 KB

patch

obsolete

>diff -u -r -N mysql51-server~/Makefile mysql51-server/Makefile
>--- mysql51-server~/Makefile	2008-02-15 03:25:26.000000000 -0500
>+++ mysql51-server/Makefile	2008-03-20 03:02:12.000000000 -0400
>@@ -7,7 +7,7 @@
> 
> PORTNAME?=	mysql
> PORTVERSION=	5.1.23
>-PORTREVISION?=	0
>+PORTREVISION?=	1
> CATEGORIES=	databases
> MASTER_SITES=	${MASTER_SITE_MYSQL}
> MASTER_SITE_SUBDIR=	MySQL-5.1
>@@ -129,7 +129,6 @@
> 	@${REINPLACE_CMD} -e "s|man1_MANS =|man1_MANS = ${MAN1}|g" ${WRKSRC}/man/Makefile.in
> 	@${REINPLACE_CMD} -e "s|install-data-am: install-pkgincludeHEADERS|install-data-am:|g" ${WRKSRC}/extra/Makefile.in
> 	@${REINPLACE_CMD} -e "s|install-data-am: install-pkgincludeHEADERS|install-data-am:|g" ${WRKSRC}/include/Makefile.in
>-	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/mysys/default.c
> 	@${REINPLACE_CMD} -e "/^AM_CXXFLAGS/s|=.*|+= \$$(NDB_CXXFLAGS)|" `${FIND} ${WRKSRC}/storage/ndb -name Makefile.in`
> .if defined(WITH_PROC_SCOPE_PTH)
> 	@${REINPLACE_CMD} -e "s|PTHREAD_SCOPE_SYSTEM|PTHREAD_SCOPE_PROCESS|g" ${WRKSRC}/sql/mysqld.cc
>@@ -164,7 +163,6 @@
> 	@${REINPLACE_CMD} -e "s|dist_pkgdata_DATA =|dist_pkgdata_DATA = mysql_fix_privilege_tables.sql|g" ${WRKSRC}/scripts/Makefile.in
> 	@${REINPLACE_CMD} -e "s|man1_MANS =|man1_MANS = ${MAN1}|g;s|man8_MANS =|man8_MANS = ${MAN8}|g" ${WRKSRC}/man/Makefile.in
> 	@${REINPLACE_CMD} -e "s|install-exec-am: install-binPROGRAMS|install-exec-am:|g" ${WRKSRC}/extra/Makefile.in
>-	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/mysys/default.c
> 
> post-install:
> 	${INSTALL_DATA} ${WRKSRC}/support-files/mysql.m4 ${PREFIX}/share/aclocal/
>diff -u -r -N mysql51-server~/files/patch-mysys_default.c mysql51-server/files/patch-mysys_default.c
>--- mysql51-server~/files/patch-mysys_default.c	2008-02-15 03:25:26.000000000 -0500
>+++ mysql51-server/files/patch-mysys_default.c	2008-03-20 02:49:21.000000000 -0400
>@@ -1,5 +1,5 @@
>---- mysys/default.c.orig	2008-01-29 22:41:43.000000000 +0100
>-+++ mysys/default.c	2008-02-14 11:03:21.000000000 +0100
>+--- mysys/default.c.orig	2008-01-29 16:41:43.000000000 -0500
>++++ mysys/default.c	2008-03-20 02:48:08.000000000 -0400
> @@ -623,7 +623,7 @@
>    {
>      MY_STAT stat_info;
>@@ -9,12 +9,11 @@
>      /*
>        Ignore world-writable regular files.
>        This is mainly done to protect us to not read a file created by
>-@@ -1102,6 +1102,8 @@
>-   bzero((char *) default_directories, sizeof(default_directories));
>-   ADD_DIRECTORY("/etc/");
>-   ADD_DIRECTORY("/etc/mysql/");
>-+  ADD_DIRECTORY("%%PREFIX%%/etc/");
>-+  ADD_DIRECTORY("%%PREFIX%%/etc/mysql/");
>+@@ -1105,6 +1105,7 @@
>  #ifdef DEFAULT_SYSCONFDIR
>    if (DEFAULT_SYSCONFDIR != "")
>      ADD_DIRECTORY(DEFAULT_SYSCONFDIR);
>++    ADD_DIRECTORY(DEFAULT_SYSCONFDIR "/mysql/");
>+ #endif
>+   ADD_COMMON_DIRECTORIES();
>+   ADD_DIRECTORY("~/");

Actions: View | Diff

Attachments on bug 121900: 85643