aboutsummaryrefslogtreecommitdiff
path: root/databases/mysql51-server
diff options
context:
space:
mode:
authorAlex Dupre <ale@FreeBSD.org>2005-04-11 09:31:05 +0000
committerAlex Dupre <ale@FreeBSD.org>2005-04-11 09:31:05 +0000
commit9fa3b2eaebe31c58a4056e51342adc3286877f20 (patch)
treef1ac31eb9b5cf919476318522c94579db0439155 /databases/mysql51-server
parent2baf749a2036ba0b3b1916cfd62b038bc6f69014 (diff)
downloadports-9fa3b2eaebe31c58a4056e51342adc3286877f20.tar.gz
ports-9fa3b2eaebe31c58a4056e51342adc3286877f20.zip
Notes
Diffstat (limited to 'databases/mysql51-server')
-rw-r--r--databases/mysql51-server/Makefile4
-rw-r--r--databases/mysql51-server/files/mysql-server.sh.in2
-rw-r--r--databases/mysql51-server/files/patch-mysys_default.c13
-rw-r--r--databases/mysql51-server/pkg-plist2
4 files changed, 18 insertions, 3 deletions
diff --git a/databases/mysql51-server/Makefile b/databases/mysql51-server/Makefile
index 4ba0f5b35d05..60ffb43d3df0 100644
--- a/databases/mysql51-server/Makefile
+++ b/databases/mysql51-server/Makefile
@@ -7,7 +7,7 @@
PORTNAME?= mysql
PORTVERSION= 5.0.3
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES= databases
MASTER_SITES= ${MASTER_SITE_MYSQL}
MASTER_SITE_SUBDIR= MySQL-5.0
@@ -153,6 +153,7 @@ post-patch:
@${REINPLACE_CMD} -e "s|dist_pkgdata_DATA =|dist_pkgdata_DATA = fill_help_tables.sql|g" ${WRKSRC}/scripts/Makefile.in
@${REINPLACE_CMD} -e "s|man_MANS =|man_MANS = ${MAN1}|g" ${WRKSRC}/man/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
.if defined(WITH_PROC_SCOPE_PTH)
@${REINPLACE_CMD} -e "s|PTHREAD_SCOPE_SYSTEM|PTHREAD_SCOPE_PROCESS|g" ${WRKSRC}/sql/mysqld.cc
.endif
@@ -189,6 +190,7 @@ post-patch:
@${REINPLACE_CMD} -e "s|bin_SCRIPTS =|bin_SCRIPTS = mysql_config mysql_fix_privilege_tables mysqlbug|g" ${WRKSRC}/scripts/Makefile.in
@${REINPLACE_CMD} -e "s|dist_pkgdata_DATA =|dist_pkgdata_DATA = mysql_fix_privilege_tables.sql|g" ${WRKSRC}/scripts/Makefile.in
@${REINPLACE_CMD} -e "s|man_MANS =|man_MANS = ${MAN1}|g" ${WRKSRC}/man/Makefile.in
+ @${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/mysys/default.c
.if defined(WITH_PROC_SCOPE_PTH)
@${REINPLACE_CMD} -e "s|PTHREAD_SCOPE_SYSTEM|PTHREAD_SCOPE_PROCESS|g" ${WRKSRC}/tools/mysqlmanager.c
.endif
diff --git a/databases/mysql51-server/files/mysql-server.sh.in b/databases/mysql51-server/files/mysql-server.sh.in
index e5870bdc1c9a..93bd177f98b3 100644
--- a/databases/mysql51-server/files/mysql-server.sh.in
+++ b/databases/mysql51-server/files/mysql-server.sh.in
@@ -37,7 +37,7 @@ mysql_user="mysql"
mysql_limits_args="-e -U ${mysql_user}"
pidfile="${mysql_dbdir}/`/bin/hostname`.pid"
command="%%PREFIX%%/bin/mysqld_safe"
-command_args="--user=${mysql_user} --datadir=${mysql_dbdir} --pid-file=${pidfile} ${mysql_args} > /dev/null &"
+command_args="--defaults-extra-file=${mysql_dbdir}/my.cnf --user=${mysql_user} --datadir=${mysql_dbdir} --pid-file=${pidfile} ${mysql_args} > /dev/null &"
procname="%%PREFIX%%/libexec/mysqld"
start_precmd="${name}_prestart"
mysql_install_db="%%PREFIX%%/bin/mysql_install_db"
diff --git a/databases/mysql51-server/files/patch-mysys_default.c b/databases/mysql51-server/files/patch-mysys_default.c
new file mode 100644
index 000000000000..af61098b1855
--- /dev/null
+++ b/databases/mysql51-server/files/patch-mysys_default.c
@@ -0,0 +1,13 @@
+--- mysys/default.c.orig Mon Apr 11 11:17:07 2005
++++ mysys/default.c Mon Apr 11 11:27:25 2005
+@@ -703,9 +703,8 @@
+ *ptr++= "sys:/etc/";
+ #else
+ *ptr++= "/etc/";
++ *ptr++= "%%PREFIX%%/etc/";
+ #endif
+- if ((env= getenv(STRINGIFY_ARG(DEFAULT_HOME_ENV))))
+- *ptr++= env;
+ *ptr++= ""; /* Place for defaults_extra_file */
+ #if !defined(__WIN__) && !defined(__NETWARE__)
+ *ptr++= "~/";;
diff --git a/databases/mysql51-server/pkg-plist b/databases/mysql51-server/pkg-plist
index 6373ea4c127f..b529b24062e9 100644
--- a/databases/mysql51-server/pkg-plist
+++ b/databases/mysql51-server/pkg-plist
@@ -1,3 +1,4 @@
+@unexec %D/etc/rc.d/mysql-server.sh stop > /dev/null 2>&1 || true
bin/comp_err
bin/my_print_defaults
bin/myisam_ftdump
@@ -167,4 +168,3 @@ libexec/mysqld
@dirrm %%DATADIR%%/swedish
@dirrm %%DATADIR%%/ukrainian
@unexec rmdir %D/%%DATADIR%% 2> /dev/null || true
-@unexec /usr/bin/killall mysqld > /dev/null 2>&1 || true