Attachment #85643 for bug #121900

View | Details | Raw Unified | Return to bug 121900
Collapse All | Expand All





PORTNAME?=	mysql
PORTVERSION=	5.1.23
PORTREVISION?=	1
CATEGORIES=	databases
MASTER_SITES=	${MASTER_SITE_MYSQL}
MASTER_SITE_SUBDIR=	MySQL-5.1

	@${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

	@${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/




--- 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;

     /*
       Ignore world-writable regular files.
       This is mainly done to protect us to not read a file created by
@@ -1105,6 +1105,7 @@
   bzero((char *) default_directories, sizeof(default_directories));
   ADD_DIRECTORY("/etc/");
   ADD_DIRECTORY("/etc/mysql/");
+  ADD_DIRECTORY("%%PREFIX%%/etc/");
+  ADD_DIRECTORY("%%PREFIX%%/etc/mysql/");
 #ifdef DEFAULT_SYSCONFDIR
   if (DEFAULT_SYSCONFDIR != "")
     ADD_DIRECTORY(DEFAULT_SYSCONFDIR);
+    ADD_DIRECTORY(DEFAULT_SYSCONFDIR "/mysql/");
 #endif
   ADD_COMMON_DIRECTORIES();
   ADD_DIRECTORY("~/");

Return to bug 121900

Lines 7-13 Link Here

(-)mysql51-server/Makefile (-3 / +1 lines)
7		7
8	PORTNAME?= mysql	8	PORTNAME?= mysql
9	PORTVERSION= 5.1.23	9	PORTVERSION= 5.1.23
10	PORTREVISION?= 0	10	PORTREVISION?= 1
11	CATEGORIES= databases	11	CATEGORIES= databases
12	MASTER_SITES= ${MASTER_SITE_MYSQL}	12	MASTER_SITES= ${MASTER_SITE_MYSQL}
13	MASTER_SITE_SUBDIR= MySQL-5.1	13	MASTER_SITE_SUBDIR= MySQL-5.1
Lines 129-135 Link Here
129	@${REINPLACE_CMD} -e "s\|man1_MANS =\|man1_MANS = ${MAN1}\|g" ${WRKSRC}/man/Makefile.in	129	@${REINPLACE_CMD} -e "s\|man1_MANS =\|man1_MANS = ${MAN1}\|g" ${WRKSRC}/man/Makefile.in
130	@${REINPLACE_CMD} -e "s\|install-data-am: install-pkgincludeHEADERS\|install-data-am:\|g" ${WRKSRC}/extra/Makefile.in	130	@${REINPLACE_CMD} -e "s\|install-data-am: install-pkgincludeHEADERS\|install-data-am:\|g" ${WRKSRC}/extra/Makefile.in
131	@${REINPLACE_CMD} -e "s\|install-data-am: install-pkgincludeHEADERS\|install-data-am:\|g" ${WRKSRC}/include/Makefile.in	131	@${REINPLACE_CMD} -e "s\|install-data-am: install-pkgincludeHEADERS\|install-data-am:\|g" ${WRKSRC}/include/Makefile.in
132	@${REINPLACE_CMD} -e "s\|%%PREFIX%%\|${PREFIX}\|g" ${WRKSRC}/mysys/default.c
133	@${REINPLACE_CMD} -e "/^AM_CXXFLAGS/s\|=.*\|+= \$$(NDB_CXXFLAGS)\|" `${FIND} ${WRKSRC}/storage/ndb -name Makefile.in`	132	@${REINPLACE_CMD} -e "/^AM_CXXFLAGS/s\|=.*\|+= \$$(NDB_CXXFLAGS)\|" `${FIND} ${WRKSRC}/storage/ndb -name Makefile.in`
134	.if defined(WITH_PROC_SCOPE_PTH)	133	.if defined(WITH_PROC_SCOPE_PTH)
135	@${REINPLACE_CMD} -e "s\|PTHREAD_SCOPE_SYSTEM\|PTHREAD_SCOPE_PROCESS\|g" ${WRKSRC}/sql/mysqld.cc	134	@${REINPLACE_CMD} -e "s\|PTHREAD_SCOPE_SYSTEM\|PTHREAD_SCOPE_PROCESS\|g" ${WRKSRC}/sql/mysqld.cc
Lines 164-170 Link Here
164	@${REINPLACE_CMD} -e "s\|dist_pkgdata_DATA =\|dist_pkgdata_DATA = mysql_fix_privilege_tables.sql\|g" ${WRKSRC}/scripts/Makefile.in	163	@${REINPLACE_CMD} -e "s\|dist_pkgdata_DATA =\|dist_pkgdata_DATA = mysql_fix_privilege_tables.sql\|g" ${WRKSRC}/scripts/Makefile.in
165	@${REINPLACE_CMD} -e "s\|man1_MANS =\|man1_MANS = ${MAN1}\|g;s\|man8_MANS =\|man8_MANS = ${MAN8}\|g" ${WRKSRC}/man/Makefile.in	164	@${REINPLACE_CMD} -e "s\|man1_MANS =\|man1_MANS = ${MAN1}\|g;s\|man8_MANS =\|man8_MANS = ${MAN8}\|g" ${WRKSRC}/man/Makefile.in
166	@${REINPLACE_CMD} -e "s\|install-exec-am: install-binPROGRAMS\|install-exec-am:\|g" ${WRKSRC}/extra/Makefile.in	165	@${REINPLACE_CMD} -e "s\|install-exec-am: install-binPROGRAMS\|install-exec-am:\|g" ${WRKSRC}/extra/Makefile.in
167	@${REINPLACE_CMD} -e "s\|%%PREFIX%%\|${PREFIX}\|g" ${WRKSRC}/mysys/default.c
168		166
169	post-install:	167	post-install:
170	${INSTALL_DATA} ${WRKSRC}/support-files/mysql.m4 ${PREFIX}/share/aclocal/	168	${INSTALL_DATA} ${WRKSRC}/support-files/mysql.m4 ${PREFIX}/share/aclocal/

Lines 1-5 Link Here

(-)mysql51-server/files/patch-mysys_default.c (-8 / +7 lines)
1	--- mysys/default.c.orig 2008-01-29 22:41:43.000000000 +0100	1	--- mysys/default.c.orig 2008-01-29 16:41:43.000000000 -0500
2	+++ mysys/default.c 2008-02-14 11:03:21.000000000 +0100	2	+++ mysys/default.c 2008-03-20 02:48:08.000000000 -0400
3	@@ -623,7 +623,7 @@	3	@@ -623,7 +623,7 @@
4	{	4	{
5	MY_STAT stat_info;	5	MY_STAT stat_info;
Lines 9-20 Link Here
9	/*	9	/*
10	Ignore world-writable regular files.	10	Ignore world-writable regular files.
11	This is mainly done to protect us to not read a file created by	11	This is mainly done to protect us to not read a file created by
12	@@ -1102,6 +1102,8 @@	12	@@ -1105,6 +1105,7 @@
13	bzero((char *) default_directories, sizeof(default_directories));
14	ADD_DIRECTORY("/etc/");
15	ADD_DIRECTORY("/etc/mysql/");
16	+ ADD_DIRECTORY("%%PREFIX%%/etc/");
17	+ ADD_DIRECTORY("%%PREFIX%%/etc/mysql/");
18	#ifdef DEFAULT_SYSCONFDIR	13	#ifdef DEFAULT_SYSCONFDIR
19	if (DEFAULT_SYSCONFDIR != "")	14	if (DEFAULT_SYSCONFDIR != "")
20	ADD_DIRECTORY(DEFAULT_SYSCONFDIR);	15	ADD_DIRECTORY(DEFAULT_SYSCONFDIR);
		16	+ ADD_DIRECTORY(DEFAULT_SYSCONFDIR "/mysql/");
		17	#endif
		18	ADD_COMMON_DIRECTORIES();
		19	ADD_DIRECTORY("~/");