Update to 5.4.2 release.

Feature safe:	yes

5 files changed, 21 insertions, 41 deletions

diff --git a/databases/mysql54-server/Makefile b/databases/mysql54-server/Makefile
index c0710426d050..7c92a2ffaced 100644
--- a/databases/mysql54-server/Makefile
+++ b/databases/mysql54-server/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME?=	mysql
-PORTVERSION=	5.4.1
+PORTVERSION=	5.4.2
 PORTREVISION?=	0
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL}
@@ -23,8 +23,6 @@ USE_GMAKE=	yes
 MAKE_JOBS_SAFE=	yes
 
 CONFIGURE_ARGS=	--localstatedir=/var/db/mysql \
-		--infodir=${PREFIX}/info \
-		--mandir=${PREFIX}/man \
 		--without-debug \
 		--without-readline \
 		--without-libedit \
@@ -44,13 +42,21 @@ CONFIGURE_ARGS+=--with-charset=${WITH_CHARSET}
 CONFIGURE_ARGS+=--with-extra-charsets=${WITH_XCHARSET}
 .endif
 .if defined(WITH_OPENSSL)
+.if !defined(WITHOUT_YASSL)
 CONFIGURE_ARGS+=--with-ssl=bundled
+.else
+USE_OPENSSL=	yes
+CONFIGURE_ARGS+=--with-ssl=${OPENSSLBASE}
+.endif
 .endif
 .if defined(WITH_FAST_MUTEXES)
 CONFIGURE_ARGS+=--with-fast-mutexes
 .endif
 .if defined(BUILD_STATIC)
 CONFIGURE_ARGS+=--with-mysqld-ldflags=-all-static
+PLIST_SUB+=	PLUGINS="@comment "
+.else
+PLIST_SUB+=	PLUGINS=""
 .endif
 .if defined(WITH_NDB)
 CONFIGURE_ARGS+=--with-plugins=max
@@ -128,7 +134,8 @@ pre-fetch:
 	@${ECHO} "	WITH_CHARSET=charset	Define the primary built-in charset (latin1)."
 	@${ECHO} "	WITH_XCHARSET=list	Define other built-in charsets (may be 'all')."
 	@${ECHO} "	WITH_COLLATION=collate	Define default collation (latin1_swedish_ci)."
-	@${ECHO} "	WITH_OPENSSL=yes	Enable secure connections."
+	@${ECHO} "	WITH_OPENSSL=yes	Enable secure connections"
+	@${ECHO} "				(define WITHOUT_YASSL for backward compatibility)."
 	@${ECHO} "	WITH_LINUXTHREADS=yes	Use the linuxthreads pthread library."
 	@${ECHO} "	WITH_PROC_SCOPE_PTH=yes	Use process scope threads"
 	@${ECHO} "				(try it if you use libpthread)."
@@ -220,7 +227,7 @@ post-patch:
 post-extract:
 	@${CP} /usr/include/tcpd.h ${WRKSRC}/include/my_tcpd.h
 
-.if defined(WITH_OPENSSL) && defined(BUILD_STATIC)
+.if defined(WITH_OPENSSL) && defined(WITHOUT_YASSL) && defined(BUILD_STATIC)
 pre-configure:
 	@${ECHO} "You can't use the BUILD_STATIC option when using OpenSSL."
 	@${FALSE}
diff --git a/databases/mysql54-server/distinfo b/databases/mysql54-server/distinfo
index 74f0168a2aba..be62c97546a6 100644
--- a/databases/mysql54-server/distinfo
+++ b/databases/mysql54-server/distinfo
@@ -1,3 +1,3 @@
-MD5 (mysql-5.4.1-beta.tar.gz) = 65e7a154e065c92c2a6bb97c9043b8b6
-SHA256 (mysql-5.4.1-beta.tar.gz) = 43b0ff572e9f1a39d84c3a74d24f63382003e8ca54d73231064d9ba075d1dcb7
-SIZE (mysql-5.4.1-beta.tar.gz) = 35199612
+MD5 (mysql-5.4.2-beta.tar.gz) = bd2c8a6fe9aeeeca221436696d751c10
+SHA256 (mysql-5.4.2-beta.tar.gz) = cc46612f4542d18a574698c7587ac7591a777584d4e8df4c033760edf29309cf
+SIZE (mysql-5.4.2-beta.tar.gz) = 37516156
diff --git a/databases/mysql54-server/files/patch-client_mysql.cc b/databases/mysql54-server/files/patch-client_mysql.cc
deleted file mode 100644
index 73bccef5bdb9..000000000000
--- a/databases/mysql54-server/files/patch-client_mysql.cc
+++ /dev/null
@@ -1,27 +0,0 @@
---- client/mysql.cc.orig	2007-11-13 13:29:42 +0000
-+++ client/mysql.cc	2008-05-01 19:16:09 +0000
-@@ -2636,9 +2636,12 @@
-   {
-     while((field = mysql_fetch_field(result)))
-     {
--      tee_fprintf(PAGER, "<TH>%s</TH>", (field->name ? 
--					 (field->name[0] ? field->name : 
--					  " &nbsp; ") : "NULL"));
-+      tee_fputs("<TH>", PAGER);
-+      if (field->name && field->name[0])
-+        xmlencode_print(field->name, field->name_length);
-+      else
-+        tee_fputs(field->name ? " &nbsp; " : "NULL", PAGER);
-+      tee_fputs("</TH>", PAGER);
-     }
-     (void) tee_fputs("</TR>", PAGER);
-   }
-@@ -2651,7 +2654,7 @@
-     for (uint i=0; i < mysql_num_fields(result); i++)
-     {
-       (void) tee_fputs("<TD>", PAGER);
--      safe_put_field(cur[i],lengths[i]);
-+      xmlencode_print(cur[i], lengths[i]);
-       (void) tee_fputs("</TD>", PAGER);
-     }
-     (void) tee_fputs("</TR>", PAGER);
diff --git a/databases/mysql54-server/files/patch-mysys_default.c b/databases/mysql54-server/files/patch-mysys_default.c
index accb061193f4..507d31425c68 100644
--- a/databases/mysql54-server/files/patch-mysys_default.c
+++ b/databases/mysql54-server/files/patch-mysys_default.c
@@ -12,7 +12,7 @@
 @@ -1128,7 +1128,10 @@
  
  #if defined(DEFAULT_SYSCONFDIR)
-   if (DEFAULT_SYSCONFDIR != "")
+   if (DEFAULT_SYSCONFDIR[0])
 +  {
      errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs);
 +    errors += add_directory(alloc, DEFAULT_SYSCONFDIR "/mysql", dirs);
diff --git a/databases/mysql54-server/pkg-plist b/databases/mysql54-server/pkg-plist
index 16f5e2330810..8e9f5b22ee79 100644
--- a/databases/mysql54-server/pkg-plist
+++ b/databases/mysql54-server/pkg-plist
@@ -75,10 +75,10 @@ lib/mysql/libmysys.a
 %%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
+%%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
 libexec/mysqld
 %%NDB%%libexec/ndb_cpcd
 %%NDB%%libexec/ndb_mgmd
@@ -157,7 +157,7 @@ libexec/mysqld
 %%NDB%%@dirrm include/mysql/storage/ndb
 %%NDB%%@dirrm include/mysql/storage
 @dirrmtry include/mysql
-@dirrm lib/mysql/plugin
+%%PLUGINS%%@dirrm lib/mysql/plugin
 @dirrmtry lib/mysql
 @dirrm %%DATADIR%%/charsets
 @dirrm %%DATADIR%%/czech