ports/85403: Update port: database/mysql50-server to 5.0.11

[Marcus Grando]

>Number:         85403
>Category:       ports
>Synopsis:       Update port: database/mysql50-server to 5.0.11
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Aug 28 15:30:09 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Marcus Grando
>Release:        FreeBSD 6.0-BETA3 i386
>Organization:
Grupos Internet S/A
>Environment:
System: FreeBSD marcus.grupos.com.br 6.0-BETA3 FreeBSD 6.0-BETA3 #29: Fri Aug 26 21:08:26 BRT 2005 root at marcus.grupos.com.br:/usr/obj/usr/src/sys/MARCUS i386


	
>Description:

- Update to 5.0.11
- Update MYSQL50_LIBVER to 15

	
>How-To-Repeat:
	
>Fix:

	

--- mysql50-server.patch begins here ---
diff -ruN mysql50-server.orig/Makefile mysql50-server/Makefile
--- mysql50-server.orig/Makefile	Tue Jul 26 16:33:01 2005
+++ mysql50-server/Makefile	Fri Aug 12 16:33:54 2005
@@ -6,8 +6,8 @@
 #
 
 PORTNAME?=	mysql
-PORTVERSION=	5.0.9
-PORTREVISION?=	1
+PORTVERSION=	5.0.11
+PORTREVISION?=	0
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL}
 MASTER_SITE_SUBDIR=	MySQL-5.0
@@ -115,7 +115,6 @@
 
 CONFLICTS=	mysql-server-3.* mysql-server-4.*
 
-PLIST_SUB=	VER=${PORTVERSION}-beta
 .if defined(WITH_NDB)
 PLIST_SUB+=	NDB=""
 .else
diff -ruN mysql50-server.orig/distinfo mysql50-server/distinfo
--- mysql50-server.orig/distinfo	Fri Jul 22 17:17:10 2005
+++ mysql50-server/distinfo	Fri Aug 12 15:40:05 2005
@@ -1,2 +1,2 @@
-MD5 (mysql-5.0.9-beta.tar.gz) = 8899d591d549d1d8ca61f5741bff490c
-SIZE (mysql-5.0.9-beta.tar.gz) = 18615183
+MD5 (mysql-5.0.11-beta.tar.gz) = ea8190373f7ea39e730f201161a01fa1
+SIZE (mysql-5.0.11-beta.tar.gz) = 18814262
diff -ruN mysql50-server.orig/files/patch-sql::mysqld.cc mysql50-server/files/patch-sql::mysqld.cc
--- mysql50-server.orig/files/patch-sql::mysqld.cc	Fri Jul 22 17:17:11 2005
+++ mysql50-server/files/patch-sql::mysqld.cc	Fri Aug 12 16:32:46 2005
@@ -1,6 +1,6 @@
---- sql/mysqld.cc.orig	Tue Dec 14 13:40:36 2004
-+++ sql/mysqld.cc	Mon Jan 10 00:28:52 2005
-@@ -128,7 +128,7 @@
+--- sql/mysqld.cc.orig	Fri Aug  5 22:39:41 2005
++++ sql/mysqld.cc	Fri Aug 12 16:32:30 2005
+@@ -121,7 +121,7 @@
  #endif /* __WIN__ */
  
  #ifdef HAVE_LIBWRAP
@@ -9,3 +9,12 @@
  #include <syslog.h>
  #ifdef NEED_SYS_SYSLOG_H
  #include <sys/syslog.h>
+@@ -3177,7 +3177,7 @@
+   init_ssl();
+ 
+ #ifdef HAVE_LIBWRAP
+-  libwrapName= my_progname+dirname_length(my_progname);
++  libwrapName= (char *) my_progname+dirname_length(my_progname);
+   openlog(libwrapName, LOG_PID, LOG_AUTH);
+ #endif
+ 
diff -ruN mysql50-server.orig/pkg-plist mysql50-server/pkg-plist
--- mysql50-server.orig/pkg-plist	Tue Jul 26 16:33:01 2005
+++ mysql50-server/pkg-plist	Fri Aug 12 16:31:00 2005
@@ -10,6 +10,7 @@
 bin/mysql_tzinfo_to_sql
 bin/mysql_waitpid
 bin/mysqld_safe
+%%NDB%%bin/ndb_config
 %%NDB%%bin/ndb_delete_all
 %%NDB%%bin/ndb_desc
 %%NDB%%bin/ndb_drop_index
@@ -67,12 +68,7 @@
 %%NDB%%libexec/ndb_cpcd
 %%NDB%%libexec/ndb_mgmd
 %%NDB%%libexec/ndbd
-%%DATADIR%%/Description.plist
-%%DATADIR%%/Info.plist
-%%DATADIR%%/MySQL-shared-compat.spec
-%%DATADIR%%/StartupParameters.plist
-%%DATADIR%%/postinstall
-%%DATADIR%%/preinstall
+%%DATADIR%%/binary-configure
 %%DATADIR%%/charsets/Index.xml
 %%DATADIR%%/charsets/README
 %%DATADIR%%/charsets/armscii8.xml
@@ -121,7 +117,6 @@
 %%DATADIR%%/my-medium.cnf
 %%DATADIR%%/my-small.cnf
 %%DATADIR%%/mysql-log-rotate
-%%DATADIR%%/mysql-%%VER%%.spec
 %%DATADIR%%/mysql.server
 %%DATADIR%%/ndb-config-2-node.ini
 %%DATADIR%%/norwegian-ny/errmsg.sys
diff -ruN mysql50-server.orig/pkg-plist.client mysql50-server/pkg-plist.client
--- mysql50-server.orig/pkg-plist.client	Tue Jul 26 16:33:01 2005
+++ mysql50-server/pkg-plist.client	Fri Aug 12 15:51:23 2005
@@ -45,10 +45,10 @@
 include/mysql/typelib.h
 lib/mysql/libmysqlclient.a
 lib/mysql/libmysqlclient.so
-lib/mysql/libmysqlclient.so.14
+lib/mysql/libmysqlclient.so.15
 lib/mysql/libmysqlclient_r.a
 lib/mysql/libmysqlclient_r.so
-lib/mysql/libmysqlclient_r.so.14
+lib/mysql/libmysqlclient_r.so.15
 %%DATADIR%%/mysql_fix_privilege_tables.sql
 @dirrm include/mysql
 @dirrm lib/mysql
--- mysql50-server.patch ends here ---

--- bsd.port.mk.patch-mysql begins here ---
--- bsd.port.mk.orig	Fri Jul 22 17:16:12 2005
+++ bsd.port.mk	Fri Aug 12 15:59:33 2005
@@ -1731,7 +1731,7 @@
 MYSQL323_LIBVER=	10
 MYSQL40_LIBVER=		12
 MYSQL41_LIBVER=		14
-MYSQL50_LIBVER=		14
+MYSQL50_LIBVER=		15
 
 # Setting/finding MySQL version we want.
 .if exists(${LOCALBASE}/bin/mysql)
--- bsd.port.mk.patch-mysql ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: