[Midnightbsd-cvs] mports: databases/mysql51-server: Update to 5.1.25

[laffer1 at midnightbsd.org]

Log Message:
-----------
Update to 5.1.25

Modified Files:
--------------
    mports/databases/mysql51-server:
        Makefile (r1.9 -> r1.10)
        distinfo (r1.5 -> r1.6)
        pkg-plist (r1.6 -> r1.7)
    mports/databases/mysql51-server/files:
        patch-mysys_default.c (r1.3 -> r1.4)

-------------- next part --------------
Index: pkg-plist
===================================================================
RCS file: /home/cvs/mports/databases/mysql51-server/pkg-plist,v
retrieving revision 1.6
retrieving revision 1.7
diff -L databases/mysql51-server/pkg-plist -L databases/mysql51-server/pkg-plist -u -r1.6 -r1.7
--- databases/mysql51-server/pkg-plist
+++ databases/mysql51-server/pkg-plist
@@ -1,4 +1,4 @@
- at unexec %D/etc/rc.d/mysql-server.sh stop > /dev/null 2>&1 || true
+ at stopdaemon mysql-server
 bin/innochecksum
 bin/my_print_defaults
 bin/myisam_ftdump
@@ -61,10 +61,6 @@
 %%NDB%%include/mysql/storage/ndb/ndbapi/ndb_cluster_connection.hpp
 %%NDB%%include/mysql/storage/ndb/ndbapi/ndb_opt_defaults.h
 %%NDB%%include/mysql/storage/ndb/ndbapi/ndberror.h
-lib/mysql/ha_example.a
-lib/mysql/ha_example.la
-lib/mysql/ha_example.so
-lib/mysql/ha_example.so.0
 lib/mysql/libdbug.a
 lib/mysql/libheap.a
 lib/mysql/libmyisam.a
@@ -76,10 +72,15 @@
 %%NDB%%lib/mysql/libndbclient.so
 %%NDB%%lib/mysql/libndbclient.so.3
 lib/mysql/libvio.a
+lib/mysql/plugin/ha_example.a
+lib/mysql/plugin/ha_example.la
+lib/mysql/plugin/ha_example.so
+lib/mysql/plugin/ha_example.so.0
 libexec/mysqld
 %%NDB%%libexec/ndb_cpcd
 %%NDB%%libexec/ndb_mgmd
 %%NDB%%libexec/ndbd
+%%DATADIR%%/ChangeLog
 %%DATADIR%%/binary-configure
 %%DATADIR%%/charsets/Index.xml
 %%DATADIR%%/charsets/README
@@ -107,6 +108,9 @@
 %%DATADIR%%/charsets/macce.xml
 %%DATADIR%%/charsets/macroman.xml
 %%DATADIR%%/charsets/swe7.xml
+%%DATADIR%%/config.huge.ini
+%%DATADIR%%/config.medium.ini
+%%DATADIR%%/config.small.ini
 %%DATADIR%%/czech/errmsg.sys
 %%DATADIR%%/danish/errmsg.sys
 %%DATADIR%%/dutch/errmsg.sys
@@ -150,6 +154,7 @@
 %%NDB%%@dirrm include/mysql/storage/ndb
 %%NDB%%@dirrm include/mysql/storage
 @dirrmtry include/mysql
+ at dirrm lib/mysql/plugin
 @dirrmtry lib/mysql
 @dirrm %%DATADIR%%/charsets
 @dirrm %%DATADIR%%/czech
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/databases/mysql51-server/Makefile,v
retrieving revision 1.9
retrieving revision 1.10
diff -L databases/mysql51-server/Makefile -L databases/mysql51-server/Makefile -u -r1.9 -r1.10
--- databases/mysql51-server/Makefile
+++ databases/mysql51-server/Makefile
@@ -7,8 +7,8 @@
 #
 
 PORTNAME?=	mysql
-PORTVERSION=	5.1.23
-PORTREVISION=	1
+PORTVERSION=	5.1.25
+PORTREVISION=	0
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL}
 MASTER_SITE_SUBDIR=	MySQL-5.1
@@ -21,7 +21,7 @@
 
 SLAVEDIRS=	databases/mysql51-client databases/mysql51-scripts
 USE_AUTOTOOLS=	libtool:15
-
+USE_GMAKE=	yes
 CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd6.0
 CONFIGURE_ARGS=	--localstatedir=/var/db/mysql \
 		--without-debug \
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/databases/mysql51-server/distinfo,v
retrieving revision 1.5
retrieving revision 1.6
diff -L databases/mysql51-server/distinfo -L databases/mysql51-server/distinfo -u -r1.5 -r1.6
--- databases/mysql51-server/distinfo
+++ databases/mysql51-server/distinfo
@@ -1,3 +1,3 @@
-MD5 (mysql-5.1.23-rc.tar.gz) = d6ca3009eee24a8e396b8f667b3bd8df
-SHA256 (mysql-5.1.23-rc.tar.gz) = 713ca3fa746d99618833ed314868d294e308b38419aa4c72eb64deda97799fec
-SIZE (mysql-5.1.23-rc.tar.gz) = 27263946
+MD5 (mysql-5.1.25-rc.tar.gz) = 3d9e8bf4f02b983d13be4ba3d33ae6ed
+SHA256 (mysql-5.1.25-rc.tar.gz) = 6441b509f29c84e63ad8dd75491caa3823496e3f5e30809e23705315e581eec0
+SIZE (mysql-5.1.25-rc.tar.gz) = 27985830
Index: patch-mysys_default.c
===================================================================
RCS file: /home/cvs/mports/databases/mysql51-server/files/patch-mysys_default.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -L databases/mysql51-server/files/patch-mysys_default.c -L databases/mysql51-server/files/patch-mysys_default.c -u -r1.3 -r1.4
--- databases/mysql51-server/files/patch-mysys_default.c
+++ databases/mysql51-server/files/patch-mysys_default.c
@@ -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-04-08 13:23:13.000000000 +0200
++++ mysys/default.c	2008-04-21 19:20:44.000000000 +0200
 @@ -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("~/");