[Midnightbsd-cvs] CVS Commit: databases/mysql51-server: Update MySQL to 5.1.20 beta.

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Fri Aug 10 11:36:58 EDT 2007 

Log Message:
-----------
Update MySQL to 5.1.20 beta.

Modified Files:
--------------
    mports/databases/mysql51-server:
        Makefile (r1.4 -> r1.5)
        distinfo (r1.3 -> r1.4)
        pkg-plist (r1.3 -> r1.4)
        pkg-plist.client (r1.1 -> r1.2)
    mports/databases/mysql51-server/files:
        mysql-server.sh.in (r1.1 -> r1.2)
        patch-Makefile.in (r1.3 -> r1.4)
        patch-configure (r1.2 -> r1.3)
        patch-scripts::Makefile.in (r1.2 -> r1.3)

Added Files:
-----------
    mports/databases/mysql51-server/files:
        patch-include_my_global.h (r1.1)
        patch-support-files_Makefile.in (r1.1)

-------------- next part --------------
Index: pkg-plist.client
===================================================================
RCS file: /home/cvs/mports/databases/mysql51-server/pkg-plist.client,v
retrieving revision 1.1
retrieving revision 1.2
diff -Ldatabases/mysql51-server/pkg-plist.client -Ldatabases/mysql51-server/pkg-plist.client -u -r1.1 -r1.2
--- databases/mysql51-server/pkg-plist.client
+++ databases/mysql51-server/pkg-plist.client
@@ -11,11 +11,13 @@
 bin/mysqlshow
 bin/mysqlslap
 bin/mysqltest
+include/mysql/decimal.h
 include/mysql/errmsg.h
 include/mysql/keycache.h
 include/mysql/m_ctype.h
 include/mysql/m_string.h
 include/mysql/my_alloc.h
+include/mysql/my_attribute.h
 include/mysql/my_config.h
 include/mysql/my_dbug.h
 include/mysql/my_dir.h
@@ -25,7 +27,6 @@
 include/mysql/my_net.h
 include/mysql/my_no_pthread.h
 include/mysql/my_pthread.h
-include/mysql/my_semaphore.h
 include/mysql/my_sys.h
 include/mysql/my_xml.h
 include/mysql/mysql.h
@@ -50,10 +51,7 @@
 lib/mysql/libmysqlclient_r.la
 lib/mysql/libmysqlclient_r.so
 lib/mysql/libmysqlclient_r.so.15
-%%ZLIB%%lib/mysql/libz.a
-%%ZLIB%%lib/mysql/libz.la
-%%ZLIB%%lib/mysql/libz.so
-%%ZLIB%%lib/mysql/libz.so.3
+share/aclocal/mysql.m4
 %%DATADIR%%/mysql_fix_privilege_tables.sql
 @dirrm include/mysql
 @dirrm lib/mysql
Index: pkg-plist
===================================================================
RCS file: /home/cvs/mports/databases/mysql51-server/pkg-plist,v
retrieving revision 1.3
retrieving revision 1.4
diff -Ldatabases/mysql51-server/pkg-plist -Ldatabases/mysql51-server/pkg-plist -u -r1.3 -r1.4
--- databases/mysql51-server/pkg-plist
+++ databases/mysql51-server/pkg-plist
@@ -1,11 +1,10 @@
- at unexec %D/etc/rc.d/mysql-server.sh stop > /dev/null 2>&1 || true
+ at comment @stopdaemon mysql-server
 bin/innochecksum
 bin/my_print_defaults
 bin/myisam_ftdump
 bin/myisamchk
 bin/myisamlog
 bin/myisampack
-bin/mysql_create_system_tables
 bin/mysql_install_db
 bin/mysql_tzinfo_to_sql
 bin/mysql_waitpid
@@ -35,6 +34,7 @@
 %%NDB%%include/mysql/storage/ndb/mgmapi/mgmapi_config_parameters.h
 %%NDB%%include/mysql/storage/ndb/mgmapi/mgmapi_config_parameters_debug.h
 %%NDB%%include/mysql/storage/ndb/mgmapi/mgmapi_debug.h
+%%NDB%%include/mysql/storage/ndb/mgmapi/mgmapi_error.h
 %%NDB%%include/mysql/storage/ndb/mgmapi/ndb_logevent.h
 %%NDB%%include/mysql/storage/ndb/mgmapi/ndbd_exit_codes.h
 %%NDB%%include/mysql/storage/ndb/ndb_constants.h
@@ -128,10 +128,11 @@
 %%DATADIR%%/my-large.cnf
 %%DATADIR%%/my-medium.cnf
 %%DATADIR%%/my-small.cnf
+%%DATADIR%%/mysql_system_tables.sql
+%%DATADIR%%/mysql_system_tables_data.sql
 %%DATADIR%%/mysql-log-rotate
 %%DATADIR%%/mysql.server
 %%DATADIR%%/ndb-config-2-node.ini
-%%NDB%%%%DATADIR%%/ndb_size.tmpl
 %%DATADIR%%/norwegian-ny/errmsg.sys
 %%DATADIR%%/norwegian/errmsg.sys
 %%DATADIR%%/polish/errmsg.sys
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/databases/mysql51-server/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -Ldatabases/mysql51-server/Makefile -Ldatabases/mysql51-server/Makefile -u -r1.4 -r1.5
--- databases/mysql51-server/Makefile
+++ databases/mysql51-server/Makefile
@@ -2,13 +2,12 @@
 # Date created:				28 Jan 2006
 # Whom:					Alex Dupre <ale at FreeBSD.org>
 #
-# $FreeBSD: ports/databases/mysql51-server/Makefile,v 1.222 2007/03/14 16:30:56 ale Exp $
 # $MidnightBSD$
+# $FreeBSD: ports/databases/mysql51-server/Makefile,v 1.226 2007/07/05 13:32:09 ale Exp $
 #
 
 PORTNAME?=	mysql
-PORTVERSION=	5.1.16
-PORTREVISION?=	0
+PORTVERSION=	5.1.20
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL}
 MASTER_SITE_SUBDIR=	MySQL-5.1
@@ -29,11 +28,11 @@
 		--with-libwrap \
 		--with-mysqlfs \
 		--with-low-memory \
-		--with-comment='MidnightBSD port: ${PKGNAME}' \
+		--with-comment='FreeBSD port: ${PKGNAME}' \
 		--enable-thread-safe-client
 
 .ifdef USE_MYSQL
-.error You have 'USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again.
+.error You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again.
 .endif
 
 .if defined(WITH_CHARSET) && ${WITH_CHARSET} != ""
@@ -57,11 +56,6 @@
 CONFIGURE_ARGS+=--with-collation=${WITH_COLLATION}
 .endif
 
-
-.if defined(SCRIPTS_ONLY)
-USE_PERL5=	yes
-.endif
-
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "i386"
@@ -93,7 +87,7 @@
 
 LATEST_LINK=	mysql51-server
 
-CONFLICTS=	mysql-server-3.* mysql-server-4.* mysql-server-5.0.*
+CONFLICTS=	mysql-server-4.* mysql-server-5.0.*
 
 USE_RC_SUBR=	mysql-server.sh
 
@@ -128,14 +122,14 @@
 	@${ECHO} ""
 
 post-patch:
-	@${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = include @docs_dirs@ @zlib_dir@ @sql_server_dirs@ storage @sql_server@ scripts @man_dirs@ support-files|g" ${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} -e "s|all: config.h|all: config.h all-local|g" ${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} -e "s|bin_SCRIPTS =|bin_SCRIPTS = @server_scripts@ mysql_create_system_tables|g" ${WRKSRC}/scripts/Makefile.in
-	@${REINPLACE_CMD} -e "s|dist_pkgdata_DATA =|dist_pkgdata_DATA = fill_help_tables.sql|g" ${WRKSRC}/scripts/Makefile.in
+	@${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = include @docs_dirs@ sql-common @sql_server_dirs@ storage scripts @sql_server@ @man_dirs@ support-files|g" ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e "s|bin_SCRIPTS =|bin_SCRIPTS = @server_scripts@|g" ${WRKSRC}/scripts/Makefile.in
+	@${REINPLACE_CMD} -e "s|dist_pkgdata_DATA =|dist_pkgdata_DATA = fill_help_tables.sql mysql_system_tables.sql mysql_system_tables_data.sql|g" ${WRKSRC}/scripts/Makefile.in
 	@${REINPLACE_CMD} -e "s|man1_MANS =|man1_MANS = ${MAN1}|g" ${WRKSRC}/man/Makefile.in
 	@${REINPLACE_CMD} -e "s|install-data-am: install-pkgincludeHEADERS|install-data-am:|g" ${WRKSRC}/extra/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
+	@${REINPLACE_CMD} -e "/^AM_CXXFLAGS/s|=.*|+= \$$(NDB_CXXFLAGS)|" `${FIND} ${WRKSRC}/storage/ndb -name Makefile.in`
 .if defined(WITH_PROC_SCOPE_PTH)
 	@${REINPLACE_CMD} -e "s|PTHREAD_SCOPE_SYSTEM|PTHREAD_SCOPE_PROCESS|g" ${WRKSRC}/sql/mysqld.cc
 .endif
@@ -143,7 +137,6 @@
 post-install:
 .if !defined(PACKAGE_BUILDING)
 	@${SETENV} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-	@${CAT} ${PKGMESSAGE}
 .endif
 
 .else
@@ -162,31 +155,29 @@
 
 CONFIGURE_ARGS+=--without-server
 
-PLIST_SUB+=	ZLIB="@comment "
-
 post-patch:
-	@${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = include @zlib_dir@ strings mysys dbug extra regex libmysql_r libmysql client scripts @man_dirs@|g" ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = include sql-common scripts strings regex mysys dbug extra libmysql libmysql_r client @man_dirs@|g" ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e "s|install-exec-am: install-pkglibLIBRARIES|install-exec-am:|g" ${WRKSRC}/strings/Makefile.in ${WRKSRC}/mysys/Makefile.in ${WRKSRC}/dbug/Makefile.in
-	@${REINPLACE_CMD} -e "s|all: config.h|all: config.h all-local|g" ${WRKSRC}/Makefile.in
 	@${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|man1_MANS =|man1_MANS = ${MAN1}|g;s|man8_MANS =|man8_MANS = ${MAN8}|g" ${WRKSRC}/man/Makefile.in
 	@${REINPLACE_CMD} -e "s|install-exec-am: install-binPROGRAMS|install-exec-am:|g" ${WRKSRC}/extra/Makefile.in
 	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/mysys/default.c
 
+post-install:
+	${INSTALL_DATA} ${WRKSRC}/support-files/mysql.m4 ${PREFIX}/share/aclocal/
+
 .else
 # MySQL-Scripts part
 USE_MYSQL=	yes
 WANT_MYSQL_VER=	51
+USE_PERL5=	yes
 
 RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/DBD/mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql51
-.if ${PERL_LEVEL} <= 500800
-RUN_DEPENDS+=	${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
-.endif
 
 LATEST_LINK=	mysql51-scripts
 
-CONFLICTS=	mysql-scripts-3.* mysql-scripts-4.* mysql-scripts-5.0.*
+CONFLICTS=	mysql-scripts-4.* mysql-scripts-5.0.*
 
 MAN1=		msql2mysql.1 mysql_zap.1 mysqlaccess.1 mysqlhotcopy.1 \
 		mysqld_multi.1 mysql_fix_privilege_tables.1
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/databases/mysql51-server/distinfo,v
retrieving revision 1.3
retrieving revision 1.4
diff -Ldatabases/mysql51-server/distinfo -Ldatabases/mysql51-server/distinfo -u -r1.3 -r1.4
--- databases/mysql51-server/distinfo
+++ databases/mysql51-server/distinfo
@@ -1,3 +1,3 @@
-MD5 (mysql-5.1.16-beta.tar.gz) = fb6fd4d26335245f679572f65c299762
-SHA256 (mysql-5.1.16-beta.tar.gz) = 1d86deaf644c237eef40ce95d6bbd00f5c5645b5bbb750c96894e2fe1600b356
-SIZE (mysql-5.1.16-beta.tar.gz) = 22468089
+MD5 (mysql-5.1.20-beta.tar.gz) = 1a3883347040de3990c152d7aceabccb
+SHA256 (mysql-5.1.20-beta.tar.gz) = 6f852c5d6fad17799cf125d19bb5e333e59b14e1d2aa8c85058990082de927d8
+SIZE (mysql-5.1.20-beta.tar.gz) = 25615303
--- /dev/null
+++ databases/mysql51-server/files/patch-include_my_global.h
@@ -0,0 +1,27 @@
+--- include/my_global.h.orig	Mon Jul  2 08:06:55 2007
++++ include/my_global.h	Mon Jul  2 08:07:53 2007
+@@ -561,12 +561,6 @@
+ #define PURIFY_OR_LINT_INIT(var)
+ #endif
+ 
+-/* Define some useful general macros */
+-#if !defined(max)
+-#define max(a, b)	((a) > (b) ? (a) : (b))
+-#define min(a, b)	((a) < (b) ? (a) : (b))
+-#endif
+-
+ #if !defined(HAVE_UINT)
+ #undef HAVE_UINT
+ #define HAVE_UINT
+@@ -1508,5 +1502,11 @@
+ 
+ /* Length of decimal number represented by INT64. */
+ #define MY_INT64_NUM_DECIMAL_DIGITS 21
++
++/* Define some useful general macros */
++#if !defined(max)
++#define max(a, b)	((a) > (b) ? (a) : (b))
++#define min(a, b)	((a) < (b) ? (a) : (b))
++#endif
+ 
+ #endif /* my_global_h */
Index: patch-configure
===================================================================
RCS file: /home/cvs/mports/databases/mysql51-server/files/patch-configure,v
retrieving revision 1.2
retrieving revision 1.3
diff -Ldatabases/mysql51-server/files/patch-configure -Ldatabases/mysql51-server/files/patch-configure -u -r1.2 -r1.3
--- databases/mysql51-server/files/patch-configure
+++ databases/mysql51-server/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Thu Oct 26 14:03:58 2006
-+++ configure	Tue Nov  7 17:13:30 2006
-@@ -20360,8 +20360,6 @@
+--- configure.orig	Sat May 26 12:22:14 2007
++++ configure	Fri Jun  1 07:53:46 2007
+@@ -20394,8 +20394,6 @@
  # This can be used to rebuild libtool when needed
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
  
@@ -9,7 +9,7 @@
  
  # Prevent multiple expansion
  
-@@ -26478,8 +26476,8 @@
+@@ -26935,8 +26933,8 @@
  # Some system specific hacks
  #
  
@@ -20,12 +20,3 @@
  
  case $SYSTEM_TYPE in
    *solaris2.7*)
-@@ -46147,7 +46145,7 @@
- 
-   MAKE_BINARY_DISTRIBUTION_OPTIONS="$MAKE_BINARY_DISTRIBUTION_OPTIONS --with-ndbcluster"
- 
--  CXXFLAGS="$CXXFLAGS \$(NDB_CXXFLAGS)"
-+  # CXXFLAGS="$CXXFLAGS \$(NDB_CXXFLAGS)"
-   if test "$have_ndb_debug" = "default"
-   then
-     have_ndb_debug=$with_debug
Index: patch-scripts::Makefile.in
===================================================================
RCS file: /home/cvs/mports/databases/mysql51-server/files/patch-scripts::Makefile.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -Ldatabases/mysql51-server/files/patch-scripts::Makefile.in -Ldatabases/mysql51-server/files/patch-scripts::Makefile.in -u -r1.2 -r1.3
--- databases/mysql51-server/files/patch-scripts::Makefile.in
+++ databases/mysql51-server/files/patch-scripts::Makefile.in
@@ -1,9 +1,9 @@
---- scripts/Makefile.in.orig	Thu Oct 26 14:03:08 2006
-+++ scripts/Makefile.in	Tue Nov  7 08:23:48 2006
-@@ -371,22 +371,7 @@
- yassl_libs = @yassl_libs@
- yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@
- zlib_dir = @zlib_dir@
+--- scripts/Makefile.in.orig	Tue May  8 11:42:25 2007
++++ scripts/Makefile.in	Thu May 17 09:30:48 2007
+@@ -399,21 +399,7 @@
+ BUILT_SOURCES = mysql_fix_privilege_tables.sql \
+ 		mysql_fix_privilege_tables_sql.c
+ 
 -bin_SCRIPTS = @server_scripts@ \
 -			msql2mysql \
 -			mysql_config \
@@ -18,18 +18,21 @@
 -			mysql_find_rows \
 -			mysqlhotcopy \
 -			mysqldumpslow \
--			mysqld_multi \
--			mysql_create_system_tables
+-			mysqld_multi
 +bin_SCRIPTS =
  
  noinst_SCRIPTS = make_binary_distribution \
  			make_sharedlib_distribution
-@@ -416,7 +401,7 @@
- 			mysqlbug \
- 			make_win_bin_dist
+@@ -445,11 +431,7 @@
+ 			mysql_system_tables_fix.sql \
+ 			CMakeLists.txt
  
--dist_pkgdata_DATA = fill_help_tables.sql mysql_fix_privilege_tables.sql
+-dist_pkgdata_DATA = fill_help_tables.sql \
+-			mysql_fix_privilege_tables.sql \
+-			mysql_system_tables.sql \
+-			mysql_system_tables_data.sql \
+-			mysql_test_data_timezone.sql
 +dist_pkgdata_DATA =
  
- # mysqlbug should be distributed built so that people can report build
- # failures with it.
+ CLEANFILES = @server_scripts@ \
+ 			make_binary_distribution \
Index: mysql-server.sh.in
===================================================================
RCS file: /home/cvs/mports/databases/mysql51-server/files/mysql-server.sh.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -Ldatabases/mysql51-server/files/mysql-server.sh.in -Ldatabases/mysql51-server/files/mysql-server.sh.in -u -r1.1 -r1.2
--- databases/mysql51-server/files/mysql-server.sh.in
+++ databases/mysql51-server/files/mysql-server.sh.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: ports/databases/mysql51-server/files/mysql-server.sh.in,v 1.3 2006/03/07 16:25:01 ale Exp $
+# $FreeBSD: ports/databases/mysql51-server/files/mysql-server.sh.in,v 1.4 2007/05/20 08:31:37 ale Exp $
 #
 
 # PROVIDE: mysql
@@ -44,7 +44,7 @@
 
 mysql_create_auth_tables()
 {
-	eval $mysql_install_db $mysql_install_db_args >/dev/null
+	eval $mysql_install_db $mysql_install_db_args >/dev/null 2>/dev/null
         [ $? -eq 0 ] && chown -R ${mysql_user}:${mysql_user} ${mysql_dbdir}
 }
 
Index: patch-Makefile.in
===================================================================
RCS file: /home/cvs/mports/databases/mysql51-server/files/patch-Makefile.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -Ldatabases/mysql51-server/files/patch-Makefile.in -Ldatabases/mysql51-server/files/patch-Makefile.in -u -r1.3 -r1.4
--- databases/mysql51-server/files/patch-Makefile.in
+++ databases/mysql51-server/files/patch-Makefile.in
@@ -1,18 +1,18 @@
---- Makefile.in.orig	Wed Dec  6 18:07:33 2006
-+++ Makefile.in	Sun Dec 31 12:03:09 2006
-@@ -395,14 +395,7 @@
+--- Makefile.in.orig	Tue May  8 11:43:16 2007
++++ Makefile.in	Thu May 17 09:28:15 2007
+@@ -396,14 +396,7 @@
  EXTRA_DIST = INSTALL-SOURCE INSTALL-WIN-SOURCE \
  			README COPYING EXCEPTIONS-CLIENT CMakeLists.txt
  
 -SUBDIRS = . include @docs_dirs@ @zlib_dir@ \
--			@readline_topdir@ sql-common \
+-			@readline_topdir@ sql-common scripts \
 -			@thread_dirs@ pstack \
 -			@sql_union_dirs@ unittest storage plugin \
--			@sql_server@ scripts @man_dirs@ tests \
+-			@sql_server@ @man_dirs@ tests \
 -			netware @libmysqld_dirs@ \
 -			mysql-test support-files sql-bench @tools_dirs@ \
 -			win
 +SUBDIRS =
  
- DIST_SUBDIRS = $(SUBDIRS) BUILD
- 
+ DIST_SUBDIRS = $(SUBDIRS) BUILD debian
+ DISTCLEANFILES = ac_available_languages_fragment
--- /dev/null
+++ databases/mysql51-server/files/patch-support-files_Makefile.in
@@ -0,0 +1,11 @@
+--- support-files/Makefile.in.orig	Thu Apr 19 09:31:48 2007
++++ support-files/Makefile.in	Thu Apr 19 09:33:03 2007
+@@ -419,7 +419,7 @@
+ 
+ pkgdata_SCRIPTS = mysql.server
+ aclocaldir = $(datadir)/aclocal
+-aclocal_DATA = mysql.m4
++aclocal_DATA =
+ noinst_DATA = mysql- at VERSION@.spec \
+ 			MySQL-shared-compat.spec
+

More information about the Midnightbsd-cvs mailing list