- Update to 5.5.3-m3 release

- Switch to use USERS and GROUPS [1]

PR:		ports/144887 [1]
Submitted by:	Sevan Janiyan <venture37@geeklan.co.uk> [1]

20 files changed, 120 insertions, 306 deletions

diff --git a/databases/mysql55-server/Makefile b/databases/mysql55-server/Makefile
index 95f2ffa6b521..dc3121cb28d1 100644
--- a/databases/mysql55-server/Makefile
+++ b/databases/mysql55-server/Makefile
@@ -6,13 +6,13 @@
 #
 
 PORTNAME?=	mysql
-PORTVERSION=	5.5.2
+PORTVERSION=	5.5.3
 PORTREVISION?=	0
-CATEGORIES=	databases
+CATEGORIES=	databases ipv6
 MASTER_SITES=	${MASTER_SITE_MYSQL}
 MASTER_SITE_SUBDIR=	MySQL-5.5
 PKGNAMESUFFIX?=	-server
-DISTNAME=	${PORTNAME}-${PORTVERSION}-m2
+DISTNAME=	${PORTNAME}-${PORTVERSION}-m3
 
 MAINTAINER=	ale@FreeBSD.org
 COMMENT?=	Multithreaded SQL database (server)
@@ -28,12 +28,16 @@ CONFIGURE_ARGS=	--localstatedir=/var/db/mysql \
 		--with-libwrap \
 		--with-low-memory \
 		--with-comment='FreeBSD port: ${PKGNAME}' \
-		--enable-thread-safe-client
+		--enable-thread-safe-client \
+		--disable-dtrace
 
 .ifdef USE_MYSQL
 .error You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again.
 .endif
 
+.if defined(WITHOUT_IPV6)
+CONFIGURE_ARGS+=--disable-ipv6
+.endif
 .if defined(WITH_CHARSET) && ${WITH_CHARSET} != ""
 CONFIGURE_ARGS+=--with-charset=${WITH_CHARSET}
 .endif
@@ -101,7 +105,11 @@ CONFLICTS=	mysql-server-[34].* mysql-server-5.[0-46-9].*
 
 USE_RC_SUBR=	mysql-server.sh
 
+USERS=		mysql
+GROUPS=		mysql
+
 .if defined(WITH_NDB)
+USE_LDCONFIG=	${PREFIX}/lib/mysql
 PLIST_SUB+=	NDB=""
 .else
 PLIST_SUB+=	NDB="@comment "
@@ -161,7 +169,6 @@ post-patch:
 
 post-install:
 .if !defined(PACKAGE_BUILDING)
-	@${SETENV} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 	@${CAT} ${PKGMESSAGE}
 .endif
 
diff --git a/databases/mysql55-server/distinfo b/databases/mysql55-server/distinfo
index c4f1e5eb2bbd..7fd572fc32b0 100644
--- a/databases/mysql55-server/distinfo
+++ b/databases/mysql55-server/distinfo
@@ -1,3 +1,3 @@
-MD5 (mysql-5.5.2-m2.tar.gz) = cd3254f29561953ffb7c023cb1b825d2
-SHA256 (mysql-5.5.2-m2.tar.gz) = 683fce1b5470dca8b1f6e8f2817905a99608b73ebeb9733adf65e942c23d6b34
-SIZE (mysql-5.5.2-m2.tar.gz) = 20738817
+MD5 (mysql-5.5.3-m3.tar.gz) = 10604ae96563ba7ac57b2d9415655260
+SHA256 (mysql-5.5.3-m3.tar.gz) = e063dffb59af6d3fdc09eceb06b02c1cef8ab866ea509ec9f9660e5f874db009
+SIZE (mysql-5.5.3-m3.tar.gz) = 23595610
diff --git a/databases/mysql55-server/files/patch-45058 b/databases/mysql55-server/files/patch-45058
deleted file mode 100644
index 859ea1ae4585..000000000000
--- a/databases/mysql55-server/files/patch-45058
+++ /dev/null
@@ -1,65 +0,0 @@
-=== modified file 'include/my_sys.h'
---- include/my_sys.h	2009-12-12 18:11:25 +0000
-+++ include/my_sys.h	2010-02-26 13:37:03 +0000
-@@ -950,7 +950,7 @@ extern my_bool resolve_charset(const cha
- extern my_bool resolve_collation(const char *cl_name,
-                                  CHARSET_INFO *default_cl,
-                                  CHARSET_INFO **cl);
--
-+extern void free_charsets(void);
- extern char *get_charsets_dir(char *buf);
- extern my_bool my_charset_same(CHARSET_INFO *cs1, CHARSET_INFO *cs2);
- extern my_bool init_compiled_charsets(myf flags);
-
-=== modified file 'libmysql/libmysql.c'
---- libmysql/libmysql.c	2009-12-18 18:44:24 +0000
-+++ libmysql/libmysql.c	2010-02-26 13:37:03 +0000
-@@ -211,6 +211,7 @@ void STDCALL mysql_server_end()
-   }
-   else
-   {
-+    free_charsets();
-     mysql_thread_end();
-   }
- 
-
-=== modified file 'mysys/charset.c'
---- mysys/charset.c	2009-12-15 09:48:29 +0000
-+++ mysys/charset.c	2010-02-26 13:37:03 +0000
-@@ -427,6 +427,12 @@ static void init_available_charsets(void
- }
- 
- 
-+static my_pthread_once_t charsets_template= MY_PTHREAD_ONCE_INIT;
-+void free_charsets(void)
-+{
-+  charsets_initialized= charsets_template;
-+}
-+
- uint get_collation_number(const char *name)
- {
-   my_pthread_once(&charsets_initialized, init_available_charsets);
-
-=== modified file 'mysys/my_init.c'
---- mysys/my_init.c	2009-12-12 18:11:25 +0000
-+++ mysys/my_init.c	2010-02-26 13:37:03 +0000
-@@ -165,6 +165,7 @@ void my_end(int infoflag)
-       my_print_open_files();
-     }
-   }
-+  free_charsets();
-   my_error_unregister_all();
-   my_once_free();
- 
-
-=== modified file 'sql/mysqld.cc'
---- sql/mysqld.cc	2010-02-05 12:55:20 +0000
-+++ sql/mysqld.cc	2010-02-26 13:37:03 +0000
-@@ -1287,6 +1287,7 @@ void clean_up(bool print_message)
-   lex_free();				/* Free some memory */
-   item_create_cleanup();
-   set_var_free();
-+  free_charsets();
-   if (!opt_noacl)
-   {
- #ifdef HAVE_DLOPEN
diff --git a/databases/mysql55-server/files/patch-Makefile.in b/databases/mysql55-server/files/patch-Makefile.in
index d5296181d21a..5ee27b803576 100644
--- a/databases/mysql55-server/files/patch-Makefile.in
+++ b/databases/mysql55-server/files/patch-Makefile.in
@@ -1,8 +1,8 @@
---- Makefile.in.orig	2009-12-07 20:09:53.000000000 +0100
-+++ Makefile.in	2009-12-29 11:32:35.000000000 +0100
-@@ -408,14 +408,7 @@
- EXTRA_DIST = INSTALL-SOURCE INSTALL-WIN-SOURCE \
- 			README COPYING EXCEPTIONS-CLIENT CMakeLists.txt
+--- Makefile.in.orig	2010-03-24 21:30:45.000000000 +0100
++++ Makefile.in	2010-04-13 16:21:29.000000000 +0200
+@@ -416,15 +416,7 @@
+ 			README COPYING EXCEPTIONS-CLIENT \
+                         CMakeLists.txt configure.cmake config.h.cmake BUILD-CMAKE
  
 -SUBDIRS = . include @docs_dirs@ @zlib_dir@ \
 -			@readline_topdir@ sql-common scripts \
@@ -11,7 +11,8 @@
 -			@sql_server@ @man_dirs@ tests \
 -			netware @libmysqld_dirs@ \
 -			mysql-test support-files sql-bench \
--			win
+-			win \
+-			cmake
 +SUBDIRS =
  
  DIST_SUBDIRS = . include Docs zlib \
diff --git a/databases/mysql55-server/files/patch-configure b/databases/mysql55-server/files/patch-configure
deleted file mode 100644
index 2bd3f24144e6..000000000000
--- a/databases/mysql55-server/files/patch-configure
+++ /dev/null
@@ -1,22 +0,0 @@
---- configure.orig	2009-07-22 12:42:18.000000000 +0200
-+++ configure	2009-07-22 12:41:05.000000000 +0200
-@@ -4000,7 +4000,7 @@
- 
- else
- 
--                ENABLE_DTRACE="yes"
-+                ENABLE_DTRACE="no"
- 
- 
- fi
-@@ -24613,8 +24613,8 @@
- # Some system specific hacks
- #
- 
--MAX_C_OPTIMIZE="-O3"
--MAX_CXX_OPTIMIZE="-O3"
-+MAX_C_OPTIMIZE=""
-+MAX_CXX_OPTIMIZE=""
- 
- case $SYSTEM_TYPE in
-   *solaris2.7*)
diff --git a/databases/mysql55-server/files/patch-configure.am b/databases/mysql55-server/files/patch-configure.am
new file mode 100644
index 000000000000..ba1bd22648e6
--- /dev/null
+++ b/databases/mysql55-server/files/patch-configure.am
@@ -0,0 +1,13 @@
+--- configure.am.orig	2010-04-13 16:22:46.000000000 +0200
++++ configure.am	2010-04-13 16:23:40.000000000 +0200
+@@ -25756,8 +25756,8 @@
+ # Some system specific hacks
+ #
+ 
+-MAX_C_OPTIMIZE="-O3"
+-MAX_CXX_OPTIMIZE="-O3"
++MAX_C_OPTIMIZE=""
++MAX_CXX_OPTIMIZE=""
+ 
+ case $SYSTEM_TYPE in
+   *solaris2.7*)
diff --git a/databases/mysql55-server/files/patch-man::Makefile.in b/databases/mysql55-server/files/patch-man::Makefile.in
index 0b15e2d4ca03..cebf7d7d08bf 100644
--- a/databases/mysql55-server/files/patch-man::Makefile.in
+++ b/databases/mysql55-server/files/patch-man::Makefile.in
@@ -1,6 +1,6 @@
---- man/Makefile.in.orig	Thu Oct 26 14:03:04 2006
-+++ man/Makefile.in	Tue Nov  7 08:19:50 2006
-@@ -363,8 +363,8 @@
+--- man/Makefile.in.orig	2010-04-13 16:40:58.000000000 +0200
++++ man/Makefile.in	2010-04-13 16:41:19.000000000 +0200
+@@ -388,8 +388,8 @@
  yassl_libs = @yassl_libs@
  yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@
  zlib_dir = @zlib_dir@
@@ -8,6 +8,6 @@
 -man8_MANS = @man8_files@
 +man1_MANS =
 +man8_MANS =
- EXTRA_DIST = $(man1_MANS) $(man8_MANS)
+ EXTRA_DIST = $(man1_MANS) $(man8_MANS) CMakeLists.txt
  all: all-am
  
diff --git a/databases/mysql55-server/pkg-install b/databases/mysql55-server/pkg-install
deleted file mode 100644
index 586f846c5031..000000000000
--- a/databases/mysql55-server/pkg-install
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/sh
-
-PATH=/bin:/usr/sbin
-
-case $2 in
-POST-INSTALL)
-	USER=mysql
-	GROUP=${USER}
-	UID=88
-	GID=${UID}
-
-	if pw group show "${GROUP}" 2>/dev/null; then
-		echo "You already have a group \"${GROUP}\", so I will use it."
-	else
-		if pw groupadd ${GROUP} -g ${GID}; then
-			echo "Added group \"${GROUP}\"."
-		else
-			echo "Adding group \"${GROUP}\" failed..."
-			exit 1
-		fi
-	fi
-
-	if pw user show "${USER}" 2>/dev/null; then
-		echo "You already have a user \"${USER}\", so I will use it."
-	else
-		if pw useradd ${USER} -u ${UID} -g ${GROUP} -h - \
-			-d /nonexistent -s /sbin/nologin -c "MySQL Daemon"
-		then
-			echo "Added user \"${USER}\"."
-		else
-			echo "Adding user \"${USER}\" failed..."
-			exit 1
-		fi
-	fi
-	;;
-esac
diff --git a/databases/mysql55-server/pkg-plist b/databases/mysql55-server/pkg-plist
index 18eb1ba4d585..9f352b94cae8 100644
--- a/databases/mysql55-server/pkg-plist
+++ b/databases/mysql55-server/pkg-plist
@@ -76,26 +76,30 @@ lib/mysql/libmysys.a
 %%NDB%%lib/mysql/libndbclient.so
 %%NDB%%lib/mysql/libndbclient.so.3
 lib/mysql/libvio.a
+%%PLUGINS%%lib/mysql/plugin/adt_null.a
+%%PLUGINS%%lib/mysql/plugin/adt_null.la
+%%PLUGINS%%lib/mysql/plugin/adt_null.so
+%%PLUGINS%%lib/mysql/plugin/adt_null.so.0
 %%PLUGINS%%lib/mysql/plugin/ha_example.a
 %%PLUGINS%%lib/mysql/plugin/ha_example.la
 %%PLUGINS%%lib/mysql/plugin/ha_example.so
 %%PLUGINS%%lib/mysql/plugin/ha_example.so.0
-%%PLUGINS%%lib/mysql/plugin/libdaemon_example.so.0
-%%PLUGINS%%lib/mysql/plugin/libdaemon_example.so
-%%PLUGINS%%lib/mysql/plugin/libdaemon_example.la
 %%PLUGINS%%lib/mysql/plugin/libdaemon_example.a
-%%PLUGINS%%lib/mysql/plugin/mypluglib.so.0
-%%PLUGINS%%lib/mysql/plugin/mypluglib.so
-%%PLUGINS%%lib/mysql/plugin/mypluglib.la
+%%PLUGINS%%lib/mysql/plugin/libdaemon_example.la
+%%PLUGINS%%lib/mysql/plugin/libdaemon_example.so
+%%PLUGINS%%lib/mysql/plugin/libdaemon_example.so.0
 %%PLUGINS%%lib/mysql/plugin/mypluglib.a
-%%PLUGINS%%lib/mysql/plugin/semisync_master.so.0
-%%PLUGINS%%lib/mysql/plugin/semisync_master.so
-%%PLUGINS%%lib/mysql/plugin/semisync_master.la
+%%PLUGINS%%lib/mysql/plugin/mypluglib.la
+%%PLUGINS%%lib/mysql/plugin/mypluglib.so
+%%PLUGINS%%lib/mysql/plugin/mypluglib.so.0
 %%PLUGINS%%lib/mysql/plugin/semisync_master.a
-%%PLUGINS%%lib/mysql/plugin/semisync_slave.so.0
-%%PLUGINS%%lib/mysql/plugin/semisync_slave.so
-%%PLUGINS%%lib/mysql/plugin/semisync_slave.la
+%%PLUGINS%%lib/mysql/plugin/semisync_master.la
+%%PLUGINS%%lib/mysql/plugin/semisync_master.so
+%%PLUGINS%%lib/mysql/plugin/semisync_master.so.0
 %%PLUGINS%%lib/mysql/plugin/semisync_slave.a
+%%PLUGINS%%lib/mysql/plugin/semisync_slave.la
+%%PLUGINS%%lib/mysql/plugin/semisync_slave.so
+%%PLUGINS%%lib/mysql/plugin/semisync_slave.so.0
 libexec/mysqld
 %%NDB%%libexec/ndb_cpcd
 %%NDB%%libexec/ndb_mgmd
diff --git a/databases/mysql55-server/pkg-plist.client b/databases/mysql55-server/pkg-plist.client
index 3e635d9b3828..b0e027a9bfbf 100644
--- a/databases/mysql55-server/pkg-plist.client
+++ b/databases/mysql55-server/pkg-plist.client
@@ -32,13 +32,18 @@ include/mysql/my_xml.h
 include/mysql/mysql.h
 include/mysql/mysql_com.h
 include/mysql/mysql_embed.h
+include/mysql/mysql_file.h
+include/mysql/mysql_thread.h
 include/mysql/mysql_time.h
 include/mysql/mysql_version.h
 include/mysql/mysqld_ername.h
 include/mysql/mysqld_error.h
 include/mysql/plugin.h
+include/mysql/plugin_audit.h
+include/mysql/plugin_ftparser.h
 include/mysql/probes_mysql.h
 include/mysql/probes_mysql_nodtrace.h
+include/mysql/psi.h
 include/mysql/services.h
 include/mysql/service_my_snprintf.h
 include/mysql/service_thd_alloc.h
diff --git a/databases/percona55-server/Makefile b/databases/percona55-server/Makefile
index 95f2ffa6b521..dc3121cb28d1 100644
--- a/databases/percona55-server/Makefile
+++ b/databases/percona55-server/Makefile
@@ -6,13 +6,13 @@
 #
 
 PORTNAME?=	mysql
-PORTVERSION=	5.5.2
+PORTVERSION=	5.5.3
 PORTREVISION?=	0
-CATEGORIES=	databases
+CATEGORIES=	databases ipv6
 MASTER_SITES=	${MASTER_SITE_MYSQL}
 MASTER_SITE_SUBDIR=	MySQL-5.5
 PKGNAMESUFFIX?=	-server
-DISTNAME=	${PORTNAME}-${PORTVERSION}-m2
+DISTNAME=	${PORTNAME}-${PORTVERSION}-m3
 
 MAINTAINER=	ale@FreeBSD.org
 COMMENT?=	Multithreaded SQL database (server)
@@ -28,12 +28,16 @@ CONFIGURE_ARGS=	--localstatedir=/var/db/mysql \
 		--with-libwrap \
 		--with-low-memory \
 		--with-comment='FreeBSD port: ${PKGNAME}' \
-		--enable-thread-safe-client
+		--enable-thread-safe-client \
+		--disable-dtrace
 
 .ifdef USE_MYSQL
 .error You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again.
 .endif
 
+.if defined(WITHOUT_IPV6)
+CONFIGURE_ARGS+=--disable-ipv6
+.endif
 .if defined(WITH_CHARSET) && ${WITH_CHARSET} != ""
 CONFIGURE_ARGS+=--with-charset=${WITH_CHARSET}
 .endif
@@ -101,7 +105,11 @@ CONFLICTS=	mysql-server-[34].* mysql-server-5.[0-46-9].*
 
 USE_RC_SUBR=	mysql-server.sh
 
+USERS=		mysql
+GROUPS=		mysql
+
 .if defined(WITH_NDB)
+USE_LDCONFIG=	${PREFIX}/lib/mysql
 PLIST_SUB+=	NDB=""
 .else
 PLIST_SUB+=	NDB="@comment "
@@ -161,7 +169,6 @@ post-patch:
 
 post-install:
 .if !defined(PACKAGE_BUILDING)
-	@${SETENV} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 	@${CAT} ${PKGMESSAGE}
 .endif
 
diff --git a/databases/percona55-server/distinfo b/databases/percona55-server/distinfo
index c4f1e5eb2bbd..7fd572fc32b0 100644
--- a/databases/percona55-server/distinfo
+++ b/databases/percona55-server/distinfo
@@ -1,3 +1,3 @@
-MD5 (mysql-5.5.2-m2.tar.gz) = cd3254f29561953ffb7c023cb1b825d2
-SHA256 (mysql-5.5.2-m2.tar.gz) = 683fce1b5470dca8b1f6e8f2817905a99608b73ebeb9733adf65e942c23d6b34
-SIZE (mysql-5.5.2-m2.tar.gz) = 20738817
+MD5 (mysql-5.5.3-m3.tar.gz) = 10604ae96563ba7ac57b2d9415655260
+SHA256 (mysql-5.5.3-m3.tar.gz) = e063dffb59af6d3fdc09eceb06b02c1cef8ab866ea509ec9f9660e5f874db009
+SIZE (mysql-5.5.3-m3.tar.gz) = 23595610
diff --git a/databases/percona55-server/files/patch-45058 b/databases/percona55-server/files/patch-45058
deleted file mode 100644
index 859ea1ae4585..000000000000
--- a/databases/percona55-server/files/patch-45058
+++ /dev/null
@@ -1,65 +0,0 @@
-=== modified file 'include/my_sys.h'
---- include/my_sys.h	2009-12-12 18:11:25 +0000
-+++ include/my_sys.h	2010-02-26 13:37:03 +0000
-@@ -950,7 +950,7 @@ extern my_bool resolve_charset(const cha
- extern my_bool resolve_collation(const char *cl_name,
-                                  CHARSET_INFO *default_cl,
-                                  CHARSET_INFO **cl);
--
-+extern void free_charsets(void);
- extern char *get_charsets_dir(char *buf);
- extern my_bool my_charset_same(CHARSET_INFO *cs1, CHARSET_INFO *cs2);
- extern my_bool init_compiled_charsets(myf flags);
-
-=== modified file 'libmysql/libmysql.c'
---- libmysql/libmysql.c	2009-12-18 18:44:24 +0000
-+++ libmysql/libmysql.c	2010-02-26 13:37:03 +0000
-@@ -211,6 +211,7 @@ void STDCALL mysql_server_end()
-   }
-   else
-   {
-+    free_charsets();
-     mysql_thread_end();
-   }
- 
-
-=== modified file 'mysys/charset.c'
---- mysys/charset.c	2009-12-15 09:48:29 +0000
-+++ mysys/charset.c	2010-02-26 13:37:03 +0000
-@@ -427,6 +427,12 @@ static void init_available_charsets(void
- }
- 
- 
-+static my_pthread_once_t charsets_template= MY_PTHREAD_ONCE_INIT;
-+void free_charsets(void)
-+{
-+  charsets_initialized= charsets_template;
-+}
-+
- uint get_collation_number(const char *name)
- {
-   my_pthread_once(&charsets_initialized, init_available_charsets);
-
-=== modified file 'mysys/my_init.c'
---- mysys/my_init.c	2009-12-12 18:11:25 +0000
-+++ mysys/my_init.c	2010-02-26 13:37:03 +0000
-@@ -165,6 +165,7 @@ void my_end(int infoflag)
-       my_print_open_files();
-     }
-   }
-+  free_charsets();
-   my_error_unregister_all();
-   my_once_free();
- 
-
-=== modified file 'sql/mysqld.cc'
---- sql/mysqld.cc	2010-02-05 12:55:20 +0000
-+++ sql/mysqld.cc	2010-02-26 13:37:03 +0000
-@@ -1287,6 +1287,7 @@ void clean_up(bool print_message)
-   lex_free();				/* Free some memory */
-   item_create_cleanup();
-   set_var_free();
-+  free_charsets();
-   if (!opt_noacl)
-   {
- #ifdef HAVE_DLOPEN
diff --git a/databases/percona55-server/files/patch-Makefile.in b/databases/percona55-server/files/patch-Makefile.in
index d5296181d21a..5ee27b803576 100644
--- a/databases/percona55-server/files/patch-Makefile.in
+++ b/databases/percona55-server/files/patch-Makefile.in
@@ -1,8 +1,8 @@
---- Makefile.in.orig	2009-12-07 20:09:53.000000000 +0100
-+++ Makefile.in	2009-12-29 11:32:35.000000000 +0100
-@@ -408,14 +408,7 @@
- EXTRA_DIST = INSTALL-SOURCE INSTALL-WIN-SOURCE \
- 			README COPYING EXCEPTIONS-CLIENT CMakeLists.txt
+--- Makefile.in.orig	2010-03-24 21:30:45.000000000 +0100
++++ Makefile.in	2010-04-13 16:21:29.000000000 +0200
+@@ -416,15 +416,7 @@
+ 			README COPYING EXCEPTIONS-CLIENT \
+                         CMakeLists.txt configure.cmake config.h.cmake BUILD-CMAKE
  
 -SUBDIRS = . include @docs_dirs@ @zlib_dir@ \
 -			@readline_topdir@ sql-common scripts \
@@ -11,7 +11,8 @@
 -			@sql_server@ @man_dirs@ tests \
 -			netware @libmysqld_dirs@ \
 -			mysql-test support-files sql-bench \
--			win
+-			win \
+-			cmake
 +SUBDIRS =
  
  DIST_SUBDIRS = . include Docs zlib \
diff --git a/databases/percona55-server/files/patch-configure b/databases/percona55-server/files/patch-configure
deleted file mode 100644
index 2bd3f24144e6..000000000000
--- a/databases/percona55-server/files/patch-configure
+++ /dev/null
@@ -1,22 +0,0 @@
---- configure.orig	2009-07-22 12:42:18.000000000 +0200
-+++ configure	2009-07-22 12:41:05.000000000 +0200
-@@ -4000,7 +4000,7 @@
- 
- else
- 
--                ENABLE_DTRACE="yes"
-+                ENABLE_DTRACE="no"
- 
- 
- fi
-@@ -24613,8 +24613,8 @@
- # Some system specific hacks
- #
- 
--MAX_C_OPTIMIZE="-O3"
--MAX_CXX_OPTIMIZE="-O3"
-+MAX_C_OPTIMIZE=""
-+MAX_CXX_OPTIMIZE=""
- 
- case $SYSTEM_TYPE in
-   *solaris2.7*)
diff --git a/databases/percona55-server/files/patch-configure.am b/databases/percona55-server/files/patch-configure.am
new file mode 100644
index 000000000000..ba1bd22648e6
--- /dev/null
+++ b/databases/percona55-server/files/patch-configure.am
@@ -0,0 +1,13 @@
+--- configure.am.orig	2010-04-13 16:22:46.000000000 +0200
++++ configure.am	2010-04-13 16:23:40.000000000 +0200
+@@ -25756,8 +25756,8 @@
+ # Some system specific hacks
+ #
+ 
+-MAX_C_OPTIMIZE="-O3"
+-MAX_CXX_OPTIMIZE="-O3"
++MAX_C_OPTIMIZE=""
++MAX_CXX_OPTIMIZE=""
+ 
+ case $SYSTEM_TYPE in
+   *solaris2.7*)
diff --git a/databases/percona55-server/files/patch-man::Makefile.in b/databases/percona55-server/files/patch-man::Makefile.in
index 0b15e2d4ca03..cebf7d7d08bf 100644
--- a/databases/percona55-server/files/patch-man::Makefile.in
+++ b/databases/percona55-server/files/patch-man::Makefile.in
@@ -1,6 +1,6 @@
---- man/Makefile.in.orig	Thu Oct 26 14:03:04 2006
-+++ man/Makefile.in	Tue Nov  7 08:19:50 2006
-@@ -363,8 +363,8 @@
+--- man/Makefile.in.orig	2010-04-13 16:40:58.000000000 +0200
++++ man/Makefile.in	2010-04-13 16:41:19.000000000 +0200
+@@ -388,8 +388,8 @@
  yassl_libs = @yassl_libs@
  yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@
  zlib_dir = @zlib_dir@
@@ -8,6 +8,6 @@
 -man8_MANS = @man8_files@
 +man1_MANS =
 +man8_MANS =
- EXTRA_DIST = $(man1_MANS) $(man8_MANS)
+ EXTRA_DIST = $(man1_MANS) $(man8_MANS) CMakeLists.txt
  all: all-am
  
diff --git a/databases/percona55-server/pkg-install b/databases/percona55-server/pkg-install
deleted file mode 100644
index 586f846c5031..000000000000
--- a/databases/percona55-server/pkg-install
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/sh
-
-PATH=/bin:/usr/sbin
-
-case $2 in
-POST-INSTALL)
-	USER=mysql
-	GROUP=${USER}
-	UID=88
-	GID=${UID}
-
-	if pw group show "${GROUP}" 2>/dev/null; then
-		echo "You already have a group \"${GROUP}\", so I will use it."
-	else
-		if pw groupadd ${GROUP} -g ${GID}; then
-			echo "Added group \"${GROUP}\"."
-		else
-			echo "Adding group \"${GROUP}\" failed..."
-			exit 1
-		fi
-	fi
-
-	if pw user show "${USER}" 2>/dev/null; then
-		echo "You already have a user \"${USER}\", so I will use it."
-	else
-		if pw useradd ${USER} -u ${UID} -g ${GROUP} -h - \
-			-d /nonexistent -s /sbin/nologin -c "MySQL Daemon"
-		then
-			echo "Added user \"${USER}\"."
-		else
-			echo "Adding user \"${USER}\" failed..."
-			exit 1
-		fi
-	fi
-	;;
-esac
diff --git a/databases/percona55-server/pkg-plist b/databases/percona55-server/pkg-plist
index 18eb1ba4d585..9f352b94cae8 100644
--- a/databases/percona55-server/pkg-plist
+++ b/databases/percona55-server/pkg-plist
@@ -76,26 +76,30 @@ lib/mysql/libmysys.a
 %%NDB%%lib/mysql/libndbclient.so
 %%NDB%%lib/mysql/libndbclient.so.3
 lib/mysql/libvio.a
+%%PLUGINS%%lib/mysql/plugin/adt_null.a
+%%PLUGINS%%lib/mysql/plugin/adt_null.la
+%%PLUGINS%%lib/mysql/plugin/adt_null.so
+%%PLUGINS%%lib/mysql/plugin/adt_null.so.0
 %%PLUGINS%%lib/mysql/plugin/ha_example.a
 %%PLUGINS%%lib/mysql/plugin/ha_example.la
 %%PLUGINS%%lib/mysql/plugin/ha_example.so
 %%PLUGINS%%lib/mysql/plugin/ha_example.so.0
-%%PLUGINS%%lib/mysql/plugin/libdaemon_example.so.0
-%%PLUGINS%%lib/mysql/plugin/libdaemon_example.so
-%%PLUGINS%%lib/mysql/plugin/libdaemon_example.la
 %%PLUGINS%%lib/mysql/plugin/libdaemon_example.a
-%%PLUGINS%%lib/mysql/plugin/mypluglib.so.0
-%%PLUGINS%%lib/mysql/plugin/mypluglib.so
-%%PLUGINS%%lib/mysql/plugin/mypluglib.la
+%%PLUGINS%%lib/mysql/plugin/libdaemon_example.la
+%%PLUGINS%%lib/mysql/plugin/libdaemon_example.so
+%%PLUGINS%%lib/mysql/plugin/libdaemon_example.so.0
 %%PLUGINS%%lib/mysql/plugin/mypluglib.a
-%%PLUGINS%%lib/mysql/plugin/semisync_master.so.0
-%%PLUGINS%%lib/mysql/plugin/semisync_master.so
-%%PLUGINS%%lib/mysql/plugin/semisync_master.la
+%%PLUGINS%%lib/mysql/plugin/mypluglib.la
+%%PLUGINS%%lib/mysql/plugin/mypluglib.so
+%%PLUGINS%%lib/mysql/plugin/mypluglib.so.0
 %%PLUGINS%%lib/mysql/plugin/semisync_master.a
-%%PLUGINS%%lib/mysql/plugin/semisync_slave.so.0
-%%PLUGINS%%lib/mysql/plugin/semisync_slave.so
-%%PLUGINS%%lib/mysql/plugin/semisync_slave.la
+%%PLUGINS%%lib/mysql/plugin/semisync_master.la
+%%PLUGINS%%lib/mysql/plugin/semisync_master.so
+%%PLUGINS%%lib/mysql/plugin/semisync_master.so.0
 %%PLUGINS%%lib/mysql/plugin/semisync_slave.a
+%%PLUGINS%%lib/mysql/plugin/semisync_slave.la
+%%PLUGINS%%lib/mysql/plugin/semisync_slave.so
+%%PLUGINS%%lib/mysql/plugin/semisync_slave.so.0
 libexec/mysqld
 %%NDB%%libexec/ndb_cpcd
 %%NDB%%libexec/ndb_mgmd
diff --git a/databases/percona55-server/pkg-plist.client b/databases/percona55-server/pkg-plist.client
index 3e635d9b3828..b0e027a9bfbf 100644
--- a/databases/percona55-server/pkg-plist.client
+++ b/databases/percona55-server/pkg-plist.client
@@ -32,13 +32,18 @@ include/mysql/my_xml.h
 include/mysql/mysql.h
 include/mysql/mysql_com.h
 include/mysql/mysql_embed.h
+include/mysql/mysql_file.h
+include/mysql/mysql_thread.h
 include/mysql/mysql_time.h
 include/mysql/mysql_version.h
 include/mysql/mysqld_ername.h
 include/mysql/mysqld_error.h
 include/mysql/plugin.h
+include/mysql/plugin_audit.h
+include/mysql/plugin_ftparser.h
 include/mysql/probes_mysql.h
 include/mysql/probes_mysql_nodtrace.h
+include/mysql/psi.h
 include/mysql/services.h
 include/mysql/service_my_snprintf.h
 include/mysql/service_thd_alloc.h