aboutsummaryrefslogtreecommitdiff
path: root/databases/mysql55-server
diff options
context:
space:
mode:
authorAlex Dupre <ale@FreeBSD.org>2010-07-16 10:24:46 +0000
committerAlex Dupre <ale@FreeBSD.org>2010-07-16 10:24:46 +0000
commit1f706238c57375a6f41cc362cc967ac2baafc2c8 (patch)
tree7c7123f7bf0f8415ad2a8efb21b8de70b2db71ce /databases/mysql55-server
parent67c4cdfbfaabc7e4815e2c791663c4b1604f8344 (diff)
Notes
Diffstat (limited to 'databases/mysql55-server')
-rw-r--r--databases/mysql55-server/Makefile30
-rw-r--r--databases/mysql55-server/distinfo6
-rw-r--r--databases/mysql55-server/files/patch-configure6
-rw-r--r--databases/mysql55-server/files/patch-configure.am24
-rw-r--r--databases/mysql55-server/files/patch-include_Makefile.in12
-rw-r--r--databases/mysql55-server/files/patch-scripts::Makefile.in13
-rw-r--r--databases/mysql55-server/pkg-plist60
-rw-r--r--databases/mysql55-server/pkg-plist.client9
8 files changed, 49 insertions, 111 deletions
diff --git a/databases/mysql55-server/Makefile b/databases/mysql55-server/Makefile
index e985ef54d8d1..0fce6e17b091 100644
--- a/databases/mysql55-server/Makefile
+++ b/databases/mysql55-server/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME?= mysql
-PORTVERSION= 5.5.4
+PORTVERSION= 5.5.5
PORTREVISION?= 0
CATEGORIES= databases ipv6
MASTER_SITES= ${MASTER_SITE_MYSQL}
@@ -27,6 +27,7 @@ CONFIGURE_ARGS= --localstatedir=/var/db/mysql \
--without-libedit \
--with-libwrap \
--with-low-memory \
+ --with-plugins=max \
--with-comment='FreeBSD port: ${PKGNAME}' \
--enable-thread-safe-client \
--disable-dtrace
@@ -61,11 +62,6 @@ PLIST_SUB+= PLUGINS="@comment "
.else
PLIST_SUB+= PLUGINS=""
.endif
-.if defined(WITH_NDB)
-CONFIGURE_ARGS+=--with-plugins=max
-.else
-CONFIGURE_ARGS+=--with-plugins=max-no-ndb
-.endif
.if defined(WITH_COLLATION) && ${WITH_COLLATION} != ""
CONFIGURE_ARGS+=--with-collation=${WITH_COLLATION}
.endif
@@ -108,25 +104,11 @@ 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 "
-.endif
-
MAN1= innochecksum.1 myisamchk.1 myisamlog.1 myisampack.1 \
my_print_defaults.1 myisam_ftdump.1 mysql_client_test_embedded.1 \
mysql_install_db.1 mysql_tzinfo_to_sql.1 \
mysql_waitpid.1 mysqld_safe.1 mysqltest_embedded.1 mysql.server.1 \
perror.1 replace.1 resolve_stack_dump.1 resolveip.1
-.if defined(WITH_NDB)
-MAN1+= ndb_config.1 ndb_delete_all.1 ndb_desc.1 ndb_drop_index.1 \
- ndb_drop_table.1 ndb_error_reporter.1 ndb_mgm.1 \
- ndb_print_backup_file.1 ndb_print_schema_file.1 \
- ndb_print_sys_file.1 ndb_restore.1 ndb_select_all.1 \
- ndb_select_count.1 ndb_show_tables.1 ndb_size.pl.1 ndb_waiter.1
-.endif
INFO= mysql
@@ -151,7 +133,6 @@ pre-fetch:
@${ECHO} " (use it if you need speed)."
@${ECHO} " BUILD_STATIC=yes Build a static version of mysqld."
@${ECHO} " (use it if you need even more speed)."
- @${ECHO} " WITH_NDB=yes Enable support for NDB Cluster."
@${ECHO} ""
post-patch:
@@ -162,7 +143,6 @@ post-patch:
@${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|install-exec-am: install-pkglibLTLIBRARIES|install-exec-am:|g" ${WRKSRC}/libmysql/Makefile.in
- @${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
@@ -190,12 +170,14 @@ CONFIGURE_ARGS+=--without-server
post-patch:
@${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = include sql-common scripts @sql_client_dirs@ @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|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|bin_SCRIPTS =|bin_SCRIPTS = mysql_config mysqlbug|g" ${WRKSRC}/scripts/Makefile.in
@${REINPLACE_CMD} -e "s|man1_MANS =|man1_MANS = ${MAN1}|g" ${WRKSRC}/man/Makefile.in
@${REINPLACE_CMD} -e "s|install-exec-am: install-binPROGRAMS|install-exec-am:|g" ${WRKSRC}/extra/Makefile.in
post-install:
+ @${MKDIR} ${PREFIX}/include/mysql/psi
+ @${MV} ${PREFIX}/include/mysql/mysql_thread.h ${PREFIX}/include/mysql/psi/mysql_thread.h
+ @${MV} ${PREFIX}/include/mysql/psi.h ${PREFIX}/include/mysql/psi/psi.h
${INSTALL_DATA} ${WRKSRC}/support-files/mysql.m4 ${PREFIX}/share/aclocal/
.else
diff --git a/databases/mysql55-server/distinfo b/databases/mysql55-server/distinfo
index 3f70c31f699c..ad8220af2603 100644
--- a/databases/mysql55-server/distinfo
+++ b/databases/mysql55-server/distinfo
@@ -1,3 +1,3 @@
-MD5 (mysql-5.5.4-m3.tar.gz) = 5d83d590407911e54ef6de52dcac0891
-SHA256 (mysql-5.5.4-m3.tar.gz) = d1c45dd628593c6f872b234a28889bf249bdc872c4f4e3c91afff8ebda18e764
-SIZE (mysql-5.5.4-m3.tar.gz) = 22761869
+MD5 (mysql-5.5.5-m3.tar.gz) = ad27f6561d6010c9346ffeca6de403fa
+SHA256 (mysql-5.5.5-m3.tar.gz) = 38e9fab063c193ba5fcefd31e6678477a7a45579da73150cac41a848399bff24
+SIZE (mysql-5.5.5-m3.tar.gz) = 22806816
diff --git a/databases/mysql55-server/files/patch-configure b/databases/mysql55-server/files/patch-configure
index ea51ece41d79..a733462f4c36 100644
--- a/databases/mysql55-server/files/patch-configure
+++ b/databases/mysql55-server/files/patch-configure
@@ -1,5 +1,5 @@
---- configure.orig 2010-04-18 11:13:22.000000000 +0200
-+++ configure 2010-04-18 11:17:01.000000000 +0200
+--- configure.orig 2010-07-06 20:37:18.000000000 +0200
++++ configure 2010-07-16 10:11:24.000000000 +0200
@@ -3,8 +3,9 @@
# of perl script that calls cmake.
@@ -9,6 +9,6 @@
+#cmake -P cmake/check_minimal_version.cmake >/dev/null 2>&1 || HAVE_CMAKE=no
+#perl --version >/dev/null 2>&1 || HAVE_CMAKE=no
+HAVE_CMAKE=no
+ scriptdir=`dirname $0`
if test "$HAVE_CMAKE" = "no"
then
- sh ./configure.am "$@"
diff --git a/databases/mysql55-server/files/patch-configure.am b/databases/mysql55-server/files/patch-configure.am
index ba1bd22648e6..39eae0a9c0b2 100644
--- a/databases/mysql55-server/files/patch-configure.am
+++ b/databases/mysql55-server/files/patch-configure.am
@@ -1,6 +1,24 @@
---- 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 @@
+--- configure.am.orig 2010-07-06 20:37:18.000000000 +0200
++++ configure.am 2010-07-16 11:11:48.000000000 +0200
+@@ -990,6 +990,8 @@
+ MYSQL_BASE_VERSION
+ MYSQL_NO_DASH_VERSION
+ MYSQL_U_SCORE_VERSION
++ndbcluster_includes
++NDB_SCI_LIBS
+ TEST_NDBCLUSTER
+ MAKEINDEX
+ PDFLATEX
+@@ -12684,6 +12686,8 @@
+ NDB_VERSION_MINOR=`echo $MYSQL_NUMERIC_VERSION | cut -d. -f2`
+ NDB_VERSION_BUILD=`echo $MYSQL_NUMERIC_VERSION | cut -d. -f3`
+ NDB_VERSION_STATUS=`echo $VERSION | sed 's/^[-.0-9]*//'`
++ndbcluster_includes=""
++NDB_SCI_LIBS=""
+ TEST_NDBCLUSTER=""
+
+
+@@ -25849,8 +25853,8 @@
# Some system specific hacks
#
diff --git a/databases/mysql55-server/files/patch-include_Makefile.in b/databases/mysql55-server/files/patch-include_Makefile.in
index ef2c4dea31ec..206952b66c3c 100644
--- a/databases/mysql55-server/files/patch-include_Makefile.in
+++ b/databases/mysql55-server/files/patch-include_Makefile.in
@@ -1,11 +1,11 @@
---- include/Makefile.in.orig 2009-07-23 14:45:21.000000000 +0200
-+++ include/Makefile.in 2009-07-23 14:45:34.000000000 +0200
-@@ -712,8 +712,6 @@
+--- include/Makefile.in.orig 2010-07-16 10:14:39.000000000 +0200
++++ include/Makefile.in 2010-07-16 10:14:51.000000000 +0200
+@@ -708,8 +708,6 @@
@HAVE_DTRACE_TRUE@probes_mysql_dtrace.h: $(DTRACEPROVIDER)
@HAVE_DTRACE_TRUE@ $(DTRACE) $(DTRACEFLAGS) -h -s $(DTRACEPROVIDER) -o $@
-probes_mysql_nodtrace.h: $(DTRACEPROVIDER)
- @PERL@ $(top_srcdir)/scripts/dheadgen.pl -f $(DTRACEPROVIDER) > $@
-
- # Don't update the files from bitkeeper
- %::SCCS/s.%
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
diff --git a/databases/mysql55-server/files/patch-scripts::Makefile.in b/databases/mysql55-server/files/patch-scripts::Makefile.in
index 7881ee6f48dc..a8fb0cbf469a 100644
--- a/databases/mysql55-server/files/patch-scripts::Makefile.in
+++ b/databases/mysql55-server/files/patch-scripts::Makefile.in
@@ -1,13 +1,12 @@
---- 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 @@
+--- scripts/Makefile.in.orig 2010-07-06 20:37:13.000000000 +0200
++++ scripts/Makefile.in 2010-07-16 10:19:28.000000000 +0200
+@@ -390,20 +390,7 @@
BUILT_SOURCES = mysql_fix_privilege_tables.sql \
mysql_fix_privilege_tables_sql.c
-bin_SCRIPTS = @server_scripts@ \
- msql2mysql \
- mysql_config \
-- mysql_fix_privilege_tables \
- mysql_fix_extensions \
- mysql_setpermission \
- mysql_secure_installation \
@@ -22,10 +21,10 @@
+bin_SCRIPTS =
noinst_SCRIPTS = make_binary_distribution \
- make_sharedlib_distribution
-@@ -445,11 +431,7 @@
+ make_sharedlib_distribution \
+@@ -439,11 +426,7 @@
mysql_system_tables_fix.sql \
- CMakeLists.txt
+ CMakeLists.txt
-dist_pkgdata_DATA = fill_help_tables.sql \
- mysql_fix_privilege_tables.sql \
diff --git a/databases/mysql55-server/pkg-plist b/databases/mysql55-server/pkg-plist
index 9f352b94cae8..586dd08c8612 100644
--- a/databases/mysql55-server/pkg-plist
+++ b/databases/mysql55-server/pkg-plist
@@ -11,58 +11,10 @@ bin/mysql_install_db
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
-%%NDB%%bin/ndb_drop_table
-%%NDB%%bin/ndb_error_reporter
-%%NDB%%bin/ndb_mgm
-%%NDB%%bin/ndb_print_backup_file
-%%NDB%%bin/ndb_print_schema_file
-%%NDB%%bin/ndb_print_sys_file
-%%NDB%%bin/ndb_restore
-%%NDB%%bin/ndb_select_all
-%%NDB%%bin/ndb_select_count
-%%NDB%%bin/ndb_show_tables
-%%NDB%%bin/ndb_size.pl
-%%NDB%%bin/ndb_test_platform
-%%NDB%%bin/ndb_waiter
bin/perror
bin/replace
bin/resolve_stack_dump
bin/resolveip
-%%NDB%%include/mysql/storage/ndb/mgmapi/mgmapi.h
-%%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
-%%NDB%%include/mysql/storage/ndb/ndb_init.h
-%%NDB%%include/mysql/storage/ndb/ndb_types.h
-%%NDB%%include/mysql/storage/ndb/ndb_version.h
-%%NDB%%include/mysql/storage/ndb/ndbapi/Ndb.hpp
-%%NDB%%include/mysql/storage/ndb/ndbapi/NdbApi.hpp
-%%NDB%%include/mysql/storage/ndb/ndbapi/NdbBlob.hpp
-%%NDB%%include/mysql/storage/ndb/ndbapi/NdbDictionary.hpp
-%%NDB%%include/mysql/storage/ndb/ndbapi/NdbError.hpp
-%%NDB%%include/mysql/storage/ndb/ndbapi/NdbEventOperation.hpp
-%%NDB%%include/mysql/storage/ndb/ndbapi/NdbIndexOperation.hpp
-%%NDB%%include/mysql/storage/ndb/ndbapi/NdbIndexScanOperation.hpp
-%%NDB%%include/mysql/storage/ndb/ndbapi/NdbIndexStat.hpp
-%%NDB%%include/mysql/storage/ndb/ndbapi/NdbOperation.hpp
-%%NDB%%include/mysql/storage/ndb/ndbapi/NdbPool.hpp
-%%NDB%%include/mysql/storage/ndb/ndbapi/NdbRecAttr.hpp
-%%NDB%%include/mysql/storage/ndb/ndbapi/NdbReceiver.hpp
-%%NDB%%include/mysql/storage/ndb/ndbapi/NdbScanFilter.hpp
-%%NDB%%include/mysql/storage/ndb/ndbapi/NdbScanOperation.hpp
-%%NDB%%include/mysql/storage/ndb/ndbapi/NdbTransaction.hpp
-%%NDB%%include/mysql/storage/ndb/ndbapi/ndbapi_limits.h
-%%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/libdbug.a
lib/mysql/libheap.a
lib/mysql/libmyisam.a
@@ -71,10 +23,6 @@ lib/mysql/libmysqld.a
lib/mysql/libmysqlservices.a
lib/mysql/libmystrings.a
lib/mysql/libmysys.a
-%%NDB%%lib/mysql/libndbclient.a
-%%NDB%%lib/mysql/libndbclient.la
-%%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
@@ -101,10 +49,6 @@ lib/mysql/libvio.a
%%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
-%%NDB%%libexec/ndbd
-%%DATADIR%%/ChangeLog
%%DATADIR%%/binary-configure
%%DATADIR%%/charsets/Index.xml
%%DATADIR%%/charsets/README
@@ -173,10 +117,6 @@ libexec/mysqld
%%DATADIR%%/spanish/errmsg.sys
%%DATADIR%%/swedish/errmsg.sys
%%DATADIR%%/ukrainian/errmsg.sys
-%%NDB%%@dirrm include/mysql/storage/ndb/mgmapi
-%%NDB%%@dirrm include/mysql/storage/ndb/ndbapi
-%%NDB%%@dirrm include/mysql/storage/ndb
-%%NDB%%@dirrm include/mysql/storage
@dirrmtry include/mysql
%%PLUGINS%%@dirrm lib/mysql/plugin
@dirrmtry lib/mysql
diff --git a/databases/mysql55-server/pkg-plist.client b/databases/mysql55-server/pkg-plist.client
index b0e027a9bfbf..13ce5a4b4638 100644
--- a/databases/mysql55-server/pkg-plist.client
+++ b/databases/mysql55-server/pkg-plist.client
@@ -1,6 +1,5 @@
bin/mysql
bin/mysql_config
-bin/mysql_fix_privilege_tables
bin/mysql_upgrade
bin/mysqladmin
bin/mysqlbinlog
@@ -33,7 +32,6 @@ 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
@@ -43,7 +41,8 @@ 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/psi/mysql_thread.h
+include/mysql/psi/psi.h
include/mysql/services.h
include/mysql/service_my_snprintf.h
include/mysql/service_thd_alloc.h
@@ -62,7 +61,7 @@ lib/mysql/libmysqlclient_r.la
lib/mysql/libmysqlclient_r.so
lib/mysql/libmysqlclient_r.so.16
share/aclocal/mysql.m4
-%%DATADIR%%/mysql_fix_privilege_tables.sql
+@dirrm include/mysql/psi
@dirrm include/mysql
@dirrm lib/mysql
-@dirrm %%DATADIR%%
+@dirrmtry %%DATADIR%%
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-13 06:37:17 +0000