diff options
| author | Alex Dupre <ale@FreeBSD.org> | 2010-12-27 15:02:38 +0000 |
|---|---|---|
| committer | Alex Dupre <ale@FreeBSD.org> | 2010-12-27 15:02:38 +0000 |
| commit | d9029c513982bd669b22c88b2f04cd4cfd5c201f (patch) | |
| tree | 7f5fb76f05a3aae44742dda07753ffe091a58bfd /databases/percona55-server | |
| parent | 8b96f7dbbc4160924ba15b29d3c18bb0e5985764 (diff) | |
| download | ports-d9029c513982bd669b22c88b2f04cd4cfd5c201f.tar.gz ports-d9029c513982bd669b22c88b2f04cd4cfd5c201f.zip | |
Notes
Diffstat (limited to 'databases/percona55-server')
29 files changed, 305 insertions, 658 deletions
diff --git a/databases/percona55-server/Makefile b/databases/percona55-server/Makefile index e1c2da06c88d..11f1bb6982dc 100644 --- a/databases/percona55-server/Makefile +++ b/databases/percona55-server/Makefile @@ -6,98 +6,57 @@ # PORTNAME?= mysql -PORTVERSION= 5.5.7 +PORTVERSION= 5.5.8 PORTREVISION?= 0 CATEGORIES= databases ipv6 MASTER_SITES= ${MASTER_SITE_MYSQL} MASTER_SITE_SUBDIR= MySQL-5.5 PKGNAMESUFFIX?= -server -DISTNAME= ${PORTNAME}-${PORTVERSION}-rc MAINTAINER= ale@FreeBSD.org COMMENT?= Multithreaded SQL database (server) -SLAVEDIRS= databases/mysql55-client databases/mysql55-scripts -GNU_CONFIGURE= yes +SLAVEDIRS= databases/mysql55-client +USE_CMAKE= yes MAKE_JOBS_SAFE= yes -CONFIGURE_ARGS= --localstatedir=/var/db/mysql \ - --without-debug \ - --without-readline \ - --without-libedit \ - --with-libwrap \ - --with-low-memory \ - --with-plugins=max-no-ndb \ - --with-comment='FreeBSD port: ${PKGNAME}' \ - --enable-thread-safe-client +OPTIONS= OPENSSL "Enable SSL support" on \ + FASTMTX "Replace mutexes with spinlocks" off + +CMAKE_ARGS+= -DINSTALL_DOCDIR="share/doc/mysql" \ + -DINSTALL_DOCREADMEDIR="share/doc/mysql" \ + -DINSTALL_INCLUDEDIR="include/mysql" \ + -DINSTALL_INFODIR="info" \ + -DINSTALL_LIBDIR="lib" \ + -DINSTALL_MANDIR="man" \ + -DINSTALL_MYSQLDATADIR="/var/db/mysql" \ + -DINSTALL_MYSQLSHAREDIR="share/mysql" \ + -DINSTALL_MYSQLTESTDIR="share/mysql/tests" \ + -DINSTALL_PLUGINDIR="lib/mysql/plugin" \ + -DINSTALL_SBINDIR="libexec" \ + -DINSTALL_SCRIPTDIR="bin" \ + -DINSTALL_SHAREDIR="share" \ + -DINSTALL_SQLBENCHDIR="share/mysql" \ + -DINSTALL_SUPPORTFILESDIR="share/mysql" \ + -DCMAKE_THREAD_LIBS:STRING="" \ + -DCMAKE_USE_PTHREADS:BOOL=ON \ + -DCMAKE_EXE_LINKER_FLAGS:STRING="${PTHREAD_LIBS}" .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 -.if defined(WITH_XCHARSET) && ${WITH_XCHARSET} != "" -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_COLLATION) && ${WITH_COLLATION} != "" -CONFIGURE_ARGS+=--with-collation=${WITH_COLLATION} -.endif - -.include <bsd.port.pre.mk> - -.if defined(WITH_DTRACE) && ${OSVERSION} >= 900021 -CONFIGURE_ARGS+=--enable-dtrace -CONFIGURE_ENV+= LDFLAGS=-lelf -.else -CONFIGURE_ARGS+=--disable-dtrace -.endif +.include <bsd.port.options.mk> -.if ${ARCH} == "i386" -CONFIGURE_ARGS+=--enable-assembler -.endif -.if defined(WITH_LINUXTHREADS) -CONFIGURE_ARGS+=--with-named-thread-libs='-DHAVE_GLIBC2_STYLE_GETHOSTBYNAME_R -CONFIGURE_ARGS+=-D_THREAD_SAFE -I${LOCALBASE}/include/pthread/linuxthreads -CFLAGS+= -D__USE_UNIX98 -D_REENTRANT -D_THREAD_SAFE -CFLAGS+= -I${LOCALBASE}/include/pthread/linuxthreads -LIB_DEPENDS+= lthread:${PORTSDIR}/devel/linuxthreads -CONFIGURE_ARGS+=-L${LOCALBASE}/lib -llthread -llgcc_r -llstdc++ -llsupc++' -.else -CONFIGURE_ARGS+=--with-named-thread-libs=${PTHREAD_LIBS} -CFLAGS+= ${PTHREAD_CFLAGS} +.if !defined(WITHOUT_OPENSSL) +CMAKE_ARGS+= -DWITH_SSL=bundled .endif - -.if defined(BUILD_OPTIMIZED) -CFLAGS+= -O3 -fno-omit-frame-pointer -CFLAGS+= -fno-gcse +.if defined(WITH_FASTMTX) +CMAKE_ARGS+= -DWITH_FAST_MUTEXES .endif -CXXFLAGS+= ${CFLAGS} -felide-constructors -fno-rtti -CXXFLAGS+= -fno-exceptions # MySQL-Server part -.if !defined(CLIENT_ONLY) && !defined(SCRIPTS_ONLY) +.if !defined(CLIENT_ONLY) USE_MYSQL= yes WANT_MYSQL_VER= 55 @@ -110,125 +69,26 @@ USE_RC_SUBR= mysql-server.sh USERS= mysql GROUPS= mysql -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 - INFO= mysql -CONFIGURE_ARGS+=--with-embedded-server - -CFLAGS+= -fPIC +MAN1= my_print_defaults.1 myisam_ftdump.1 myisamchk.1 myisamlog.1 myisampack.1 \ + mysql.server.1 mysql_convert_table_format.1 mysql_fix_extensions.1 \ + mysql_install_db.1 mysql_secure_installation.1 mysql_setpermission.1 \ + mysql_tzinfo_to_sql.1 mysql_upgrade.1 mysql_zap.1 mysqlbug.1 \ + mysqld_multi.1 mysqld_safe.1 mysqldumpslow.1 mysqlhotcopy.1 mysqlman.1 \ + mysqltest.1 perror.1 replace.1 resolve_stack_dump.1 resolveip.1 -.if ${OSVERSION} < 700000 -BROKEN= does not build on 6.X -.endif - -pre-fetch: - @${ECHO} "" - @${ECHO} "You may use the following build options:" - @${ECHO} "" - @${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)." -.if ${OSVERSION} >= 900021 - @${ECHO} " WITH_DTRACE=yes Enable DTrace." -.endif - @${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)." - @${ECHO} " WITH_FAST_MUTEXES=yes Replace mutexes with spinlocks." - @${ECHO} " BUILD_OPTIMIZED=yes Enable compiler optimizations" - @${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} "" +MAN8= mysqld.8 -post-patch: - @${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = include @docs_dirs@ sql-common scripts libservices @sql_server_dirs@ libmysql @sql_server@ @man_dirs@ @libmysqld_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|install-exec-am: install-pkglibLTLIBRARIES|install-exec-am:|g" ${WRKSRC}/libmysql/Makefile.in -.if defined(WITH_PROC_SCOPE_PTH) - @${REINPLACE_CMD} -e "s|PTHREAD_SCOPE_SYSTEM|PTHREAD_SCOPE_PROCESS|g" ${WRKSRC}/sql/mysqld.cc -.endif +CMAKE_ARGS+= -DWITH_EMBEDDED_SERVER="ON" post-install: .if !defined(PACKAGE_BUILDING) @${CAT} ${PKGMESSAGE} .endif - -.else -# MySQL-Client part -.if defined(CLIENT_ONLY) -LATEST_LINK= mysql55-client - -CONFLICTS= mysql-client-[34].* mysql-client-5.[0-46-9].* - -MAN1= mysql_config.1 mysql_upgrade.1 mysql.1 mysqladmin.1 \ - mysqlbinlog.1 mysqlbug.1 mysqlcheck.1 \ - mysqldump.1 mysqlimport.1 mysqlshow.1 mysqlslap.1 mysqltest.1 - -USE_LDCONFIG= ${PREFIX}/lib/mysql - -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 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: - ${INSTALL_DATA} ${WRKSRC}/support-files/mysql.m4 ${PREFIX}/share/aclocal/ - -.else -# MySQL-Scripts part -USE_MYSQL= yes -WANT_MYSQL_VER= 55 - -RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/DBD/mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql55 -.if ${PERL_LEVEL} <= 500800 -RUN_DEPENDS+= ${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp .endif -LATEST_LINK= mysql55-scripts - -CONFLICTS= mysql-scripts-[34].* mysql-scripts-5.[0-46-9].* - -MAN1= msql2mysql.1 mysql_convert_table_format.1 mysql_find_rows.1 \ - mysql_fix_extensions.1 mysql_secure_installation.1 \ - mysql_setpermission.1 mysql_zap.1 mysqlaccess.1 \ - mysqldumpslow.1 mysqlhotcopy.1 mysqld_multi.1 - -SCRIPTS= msql2mysql mysql_fix_extensions mysql_setpermission \ - mysql_secure_installation mysql_zap mysqlaccess \ - mysql_convert_table_format mysql_find_rows mysqlhotcopy \ - mysqldumpslow mysqld_multi - post-patch: - @${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = scripts @man_dirs@|g" ${WRKSRC}/Makefile.in - @${REINPLACE_CMD} -e "s|bin_SCRIPTS =|bin_SCRIPTS = ${SCRIPTS}|g" ${WRKSRC}/scripts/Makefile.in - @${REINPLACE_CMD} -e "s|install-exec-am install-data-am|install-exec-am|g" ${WRKSRC}/scripts/Makefile.in - @${REINPLACE_CMD} -e "s|man1_MANS =|man1_MANS = ${MAN1}|g" ${WRKSRC}/man/Makefile.in -.endif -.endif -# Common part -post-extract: - @${CP} /usr/include/tcpd.h ${WRKSRC}/include/my_tcpd.h - -.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} -.endif + @${REINPLACE_CMD} 's/*.1/${MAN1}/' ${WRKSRC}/man/CMakeLists.txt -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/databases/percona55-server/distinfo b/databases/percona55-server/distinfo index 6740a21db711..5d5dbc17dc04 100644 --- a/databases/percona55-server/distinfo +++ b/databases/percona55-server/distinfo @@ -1,2 +1,2 @@ -SHA256 (mysql-5.5.7-rc.tar.gz) = f1c7c8ae7db509420a4b56fa541a334a0abfb976b98c66c07484b725fee12b0c -SIZE (mysql-5.5.7-rc.tar.gz) = 25495029 +SHA256 (mysql-5.5.8.tar.gz) = e1175da267e8124507d69a259e144e59043f03e7a7cff81185f412cb1d6bcda2 +SIZE (mysql-5.5.8.tar.gz) = 24258297 diff --git a/databases/percona55-server/files/mysql-server.sh.in b/databases/percona55-server/files/mysql-server.sh.in index eb7abb96fee3..bc747df597ed 100644 --- a/databases/percona55-server/files/mysql-server.sh.in +++ b/databases/percona55-server/files/mysql-server.sh.in @@ -41,7 +41,7 @@ procname="%%PREFIX%%/libexec/mysqld" start_precmd="${name}_prestart" start_postcmd="${name}_poststart" mysql_install_db="%%PREFIX%%/bin/mysql_install_db" -mysql_install_db_args="--ldata=${mysql_dbdir}" +mysql_install_db_args="--basedir=%%PREFIX%% --datadir=${mysql_dbdir} --force" mysql_create_auth_tables() { diff --git a/databases/percona55-server/files/patch-CMakeLists.txt b/databases/percona55-server/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..c0a8713402cb --- /dev/null +++ b/databases/percona55-server/files/patch-CMakeLists.txt @@ -0,0 +1,38 @@ +--- CMakeLists.txt.orig 2010-12-03 18:58:24.000000000 +0100 ++++ CMakeLists.txt 2010-12-23 18:02:02.000000000 +0100 +@@ -293,7 +293,6 @@ + + ADD_SUBDIRECTORY(extra) + IF(NOT WITHOUT_SERVER) +- ADD_SUBDIRECTORY(tests) + ADD_SUBDIRECTORY(client) + ADD_SUBDIRECTORY(sql) + ADD_SUBDIRECTORY(sql/share) +@@ -301,14 +300,10 @@ + OPTION (WITH_EMBEDDED_SERVER "Compile MySQL with embedded server" OFF) + IF(WITH_EMBEDDED_SERVER) + ADD_SUBDIRECTORY(libmysqld) +- ADD_SUBDIRECTORY(libmysqld/examples) + ENDIF(WITH_EMBEDDED_SERVER) + +- ADD_SUBDIRECTORY(mysql-test) +- ADD_SUBDIRECTORY(mysql-test/lib/My/SafeProcess) + ADD_SUBDIRECTORY(support-files) + ADD_SUBDIRECTORY(scripts) +- ADD_SUBDIRECTORY(sql-bench) + IF(UNIX) + ADD_SUBDIRECTORY(man) + ENDIF() +@@ -343,6 +338,7 @@ + # + # RPM installs documentation directly from the source tree + # ++IF(FALSE) + IF(NOT INSTALL_LAYOUT MATCHES "RPM") + INSTALL(FILES COPYING LICENSE.mysql + DESTINATION ${INSTALL_DOCREADMEDIR} +@@ -367,3 +363,4 @@ + PATTERN "sp-imp-spec.txt" EXCLUDE + ) + ENDIF() ++ENDIF() diff --git a/databases/percona55-server/files/patch-Docs::Makefile.in b/databases/percona55-server/files/patch-Docs::Makefile.in deleted file mode 100644 index 51888b7712cc..000000000000 --- a/databases/percona55-server/files/patch-Docs::Makefile.in +++ /dev/null @@ -1,20 +0,0 @@ ---- Docs/Makefile.in.orig 2008-01-29 22:43:40.000000000 +0100 -+++ Docs/Makefile.in 2008-02-14 08:21:57.000000000 +0100 -@@ -368,7 +368,7 @@ - yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@ - zlib_dir = @zlib_dir@ - EXTRA_DIST = mysql.info INSTALL-BINARY @extra_docs@ --all: all-am -+all: - - .SUFFIXES: - $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) -@@ -453,7 +453,7 @@ - install-data: install-data-am - uninstall: uninstall-am - --install-am: all-am -+install-am: - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - - installcheck: installcheck-am diff --git a/databases/percona55-server/files/patch-Makefile.in b/databases/percona55-server/files/patch-Makefile.in deleted file mode 100644 index 7a16327dc95e..000000000000 --- a/databases/percona55-server/files/patch-Makefile.in +++ /dev/null @@ -1,20 +0,0 @@ ---- Makefile.in.orig 2010-09-17 22:48:47.000000000 +0200 -+++ Makefile.in 2010-09-27 14:55:30.000000000 +0200 -@@ -419,16 +419,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 \ -- libservices \ -- @sql_union_dirs@ unittest \ -- @sql_server@ @man_dirs@ tests \ -- @libmysqld_dirs@ \ -- mysql-test support-files sql-bench \ -- win \ -- packaging \ -- cmake -+SUBDIRS = - - DIST_SUBDIRS = . include Docs zlib \ - cmd-line-utils sql-common scripts \ diff --git a/databases/percona55-server/files/patch-client_CMakeLists.txt b/databases/percona55-server/files/patch-client_CMakeLists.txt new file mode 100644 index 000000000000..b36a0f4c1791 --- /dev/null +++ b/databases/percona55-server/files/patch-client_CMakeLists.txt @@ -0,0 +1,53 @@ +--- client/CMakeLists.txt.orig 2010-12-03 18:58:26.000000000 +0100 ++++ client/CMakeLists.txt 2010-12-23 18:01:04.000000000 +0100 +@@ -27,17 +27,20 @@ + + ADD_DEFINITIONS(${READLINE_DEFINES}) + ADD_DEFINITIONS(${SSL_DEFINES}) ++IF(FALSE) + MYSQL_ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc sql_string.cc) + TARGET_LINK_LIBRARIES(mysql mysqlclient) + IF(UNIX) + TARGET_LINK_LIBRARIES(mysql ${READLINE_LIBRARY}) + ENDIF(UNIX) ++ENDIF() + + MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test) + SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS") + TARGET_LINK_LIBRARIES(mysqltest mysqlclient regex) + + ++IF(FALSE) + MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c) + TARGET_LINK_LIBRARIES(mysqlcheck mysqlclient) + +@@ -46,11 +49,13 @@ + + MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c) + TARGET_LINK_LIBRARIES(mysqlimport mysqlclient) ++ENDIF() + + MYSQL_ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c) + TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient) + ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs) + ++IF(FALSE) + MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c) + TARGET_LINK_LIBRARIES(mysqlshow mysqlclient) + +@@ -63,13 +68,14 @@ + MYSQL_ADD_EXECUTABLE(mysqlslap mysqlslap.c) + SET_SOURCE_FILES_PROPERTIES(mysqlslap.c PROPERTIES COMPILE_FLAGS "-DTHREADS") + TARGET_LINK_LIBRARIES(mysqlslap mysqlclient) ++ENDIF() + + # "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/". + IF(WIN32) + MYSQL_ADD_EXECUTABLE(echo echo.c) + ENDIF(WIN32) + +-SET_TARGET_PROPERTIES (mysqlcheck mysqldump mysqlimport mysql_upgrade mysqlshow mysqlslap ++SET_TARGET_PROPERTIES (mysql_upgrade + PROPERTIES HAS_CXX TRUE) + + ADD_DEFINITIONS(-DHAVE_DLOPEN) diff --git a/databases/percona55-server/files/patch-configure b/databases/percona55-server/files/patch-configure deleted file mode 100644 index a733462f4c36..000000000000 --- a/databases/percona55-server/files/patch-configure +++ /dev/null @@ -1,14 +0,0 @@ ---- 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. - - # Ensure cmake and perl are there --cmake -P cmake/check_minimal_version.cmake >/dev/null 2>&1 || HAVE_CMAKE=no --perl --version >/dev/null 2>&1 || HAVE_CMAKE=no -+#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 diff --git a/databases/percona55-server/files/patch-configure.am b/databases/percona55-server/files/patch-configure.am deleted file mode 100644 index 6b36fbea8ec8..000000000000 --- a/databases/percona55-server/files/patch-configure.am +++ /dev/null @@ -1,22 +0,0 @@ ---- configure.am.orig 2010-11-02 23:01:46.000000000 +0100 -+++ configure.am 2010-11-10 16:31:42.000000000 +0100 -@@ -12722,7 +12722,7 @@ - _ACEOF - - case "$target_os" in -- *solaris*) -+ *solaris*|*freebsd*) - HAVE_DTRACE_DASH_G="yes" - ;; - *) -@@ -25432,8 +25432,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.cmake b/databases/percona55-server/files/patch-configure.cmake new file mode 100644 index 000000000000..2bac6ffc2068 --- /dev/null +++ b/databases/percona55-server/files/patch-configure.cmake @@ -0,0 +1,20 @@ +--- configure.cmake.orig 2010-12-24 10:05:05.000000000 +0100 ++++ configure.cmake 2010-12-24 10:06:21.000000000 +0100 +@@ -144,7 +144,6 @@ + IF(NOT LIBRT) + MY_SEARCH_LIBS(clock_gettime rt LIBRT) + ENDIF() +- FIND_PACKAGE(Threads) + + SET(CMAKE_REQUIRED_LIBRARIES + ${LIBM} ${LIBNSL} ${LIBBIND} ${LIBCRYPT} ${LIBSOCKET} ${LIBDL} ${CMAKE_THREAD_LIBS_INIT} ${LIBRT}) +@@ -265,9 +264,6 @@ + CHECK_INCLUDE_FILES (sys/ptem.h HAVE_SYS_PTEM_H) + ENDIF() + +-# Figure out threading library +-# +-FIND_PACKAGE (Threads) + + # + # Tests for functions diff --git a/databases/percona55-server/files/patch-extra_CMakeLists.txt b/databases/percona55-server/files/patch-extra_CMakeLists.txt new file mode 100644 index 000000000000..f8f555f5e0e8 --- /dev/null +++ b/databases/percona55-server/files/patch-extra_CMakeLists.txt @@ -0,0 +1,12 @@ +--- extra/CMakeLists.txt.orig 2010-12-23 17:38:06.000000000 +0100 ++++ extra/CMakeLists.txt 2010-12-23 17:38:51.000000000 +0100 +@@ -75,7 +75,9 @@ + MYSQL_ADD_EXECUTABLE(resolve_stack_dump resolve_stack_dump.c) + TARGET_LINK_LIBRARIES(resolve_stack_dump mysys) + ++IF(FALSE) + MYSQL_ADD_EXECUTABLE(mysql_waitpid mysql_waitpid.c) + TARGET_LINK_LIBRARIES(mysql_waitpid mysys) + ENDIF() ++ENDIF() + diff --git a/databases/percona55-server/files/patch-extra_yassl_Makefile.in b/databases/percona55-server/files/patch-extra_yassl_Makefile.in deleted file mode 100644 index bbf9076373ed..000000000000 --- a/databases/percona55-server/files/patch-extra_yassl_Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- extra/yassl/Makefile.in.orig 2008-10-11 23:58:20.000000000 +0200 -+++ extra/yassl/Makefile.in 2008-10-31 08:14:13.000000000 +0100 -@@ -355,7 +355,7 @@ - yassl_libs = @yassl_libs@ - yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@ - zlib_dir = @zlib_dir@ --SUBDIRS = taocrypt src testsuite -+SUBDIRS = taocrypt src - EXTRA_DIST = CMakeLists.txt - all: all-recursive - diff --git a/databases/percona55-server/files/patch-extra_yassl_taocrypt_Makefile.in b/databases/percona55-server/files/patch-extra_yassl_taocrypt_Makefile.in deleted file mode 100644 index db67689eba4e..000000000000 --- a/databases/percona55-server/files/patch-extra_yassl_taocrypt_Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- extra/yassl/taocrypt/Makefile.in.orig 2008-10-11 23:58:20.000000000 +0200 -+++ extra/yassl/taocrypt/Makefile.in 2008-10-31 08:15:56.000000000 +0100 -@@ -355,7 +355,7 @@ - yassl_libs = @yassl_libs@ - yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@ - zlib_dir = @zlib_dir@ --SUBDIRS = src test benchmark -+SUBDIRS = src - EXTRA_DIST = CMakeLists.txt $(wildcard mySTL/*.hpp) - all: all-recursive - diff --git a/databases/percona55-server/files/patch-include_CMakeLists.txt b/databases/percona55-server/files/patch-include_CMakeLists.txt new file mode 100644 index 000000000000..e25615d59e0e --- /dev/null +++ b/databases/percona55-server/files/patch-include_CMakeLists.txt @@ -0,0 +1,12 @@ +--- include/CMakeLists.txt.orig 2010-12-23 16:09:41.000000000 +0100 ++++ include/CMakeLists.txt 2010-12-23 16:10:01.000000000 +0100 +@@ -58,7 +58,9 @@ + ${HEADERS_GEN_CONFIGURE} + ) + ++IF(FALSE) + INSTALL(FILES ${HEADERS} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development) + INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development FILES_MATCHING PATTERN "*.h" ) ++ENDIF() + + diff --git a/databases/percona55-server/files/patch-include_Makefile.in b/databases/percona55-server/files/patch-include_Makefile.in deleted file mode 100644 index 1400dfc86aff..000000000000 --- a/databases/percona55-server/files/patch-include_Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- include/Makefile.in.orig 2010-07-27 16:46:08.000000000 +0200 -+++ include/Makefile.in 2010-07-27 16:48:45.000000000 +0200 -@@ -708,8 +707,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) > $@ - # 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/percona55-server/files/patch-include_my_libwrap.h b/databases/percona55-server/files/patch-include_my_libwrap.h deleted file mode 100644 index a115f40fc8fc..000000000000 --- a/databases/percona55-server/files/patch-include_my_libwrap.h +++ /dev/null @@ -1,11 +0,0 @@ ---- include/my_libwrap.h.orig Tue Nov 7 08:39:53 2006 -+++ include/my_libwrap.h Tue Nov 7 08:40:17 2006 -@@ -15,7 +15,7 @@ - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ - - #ifdef HAVE_LIBWRAP --#include <tcpd.h> -+#include <my_tcpd.h> - #include <syslog.h> - #ifdef NEED_SYS_SYSLOG_H - #include <sys/syslog.h> diff --git a/databases/percona55-server/files/patch-include_my_tcpd.h b/databases/percona55-server/files/patch-include_my_tcpd.h deleted file mode 100644 index 38aad1aa57d7..000000000000 --- a/databases/percona55-server/files/patch-include_my_tcpd.h +++ /dev/null @@ -1,147 +0,0 @@ ---- include/my_tcpd.h.orig Sun Jan 9 13:33:51 2005 -+++ include/my_tcpd.h Sun Jan 9 13:41:42 2005 -@@ -6,6 +6,25 @@ - * $FreeBSD$ - */ - -+#ifndef _TCPWRAPPERS_TCPD_H -+#define _TCPWRAPPERS_TCPD_H -+ -+/* someone else may have defined this */ -+#undef __P -+ -+/* use prototypes if we have an ANSI C compiler or are using C++ */ -+#if defined(__STDC__) || defined(__cplusplus) -+#define __P(args) args -+#else -+#define __P(args) () -+#endif -+ -+/* Need definitions of struct sockaddr_in and FILE. */ -+#include <netinet/in.h> -+#include <stdio.h> -+ -+__BEGIN_DECLS -+ - /* Structure to describe one communications endpoint. */ - - #define STRING_LENGTH 128 /* hosts, users, processes */ -@@ -31,10 +50,10 @@ - char pid[10]; /* access via eval_pid(request) */ - struct host_info client[1]; /* client endpoint info */ - struct host_info server[1]; /* server endpoint info */ -- void (*sink) (); /* datagram sink function or 0 */ -- void (*hostname) (); /* address to printable hostname */ -- void (*hostaddr) (); /* address to printable address */ -- void (*cleanup) (); /* cleanup function or 0 */ -+ void (*sink) __P((int)); /* datagram sink function or 0 */ -+ void (*hostname) __P((struct host_info *)); /* address to printable hostname */ -+ void (*hostaddr) __P((struct host_info *)); /* address to printable address */ -+ void (*cleanup) __P((struct request_info *)); /* cleanup function or 0 */ - struct netconfig *config; /* netdir handle */ - }; - -@@ -67,20 +86,23 @@ - /* Global functions. */ - - #if defined(TLI) || defined(PTX) || defined(TLI_SEQUENT) --extern void fromhost(); /* get/validate client host info */ -+extern void fromhost __P((struct request_info *)); /* get/validate client host info */ - #else - #define fromhost sock_host /* no TLI support needed */ - #endif - --extern int hosts_access(); /* access control */ --extern void shell_cmd(); /* execute shell command */ --extern char *percent_x(); /* do %<char> expansion */ --extern void rfc931(); /* client name from RFC 931 daemon */ --extern void clean_exit(); /* clean up and exit */ --extern void refuse(); /* clean up and exit */ --extern char *xgets(); /* fgets() on steroids */ --extern char *split_at(); /* strchr() and split */ --extern unsigned long dot_quad_addr(); /* restricted inet_addr() */ -+extern void shell_cmd __P((char *)); /* execute shell command */ -+extern char *percent_x __P((char *, int, char *, struct request_info *)); /* do %<char> expansion */ -+#ifdef INET6 -+extern void rfc931 __P((struct sockaddr *, struct sockaddr *, char *)); /* client name from RFC 931 daemon */ -+#else -+extern void rfc931 __P((struct sockaddr_in *, struct sockaddr_in *, char *)); /* client name from RFC 931 daemon */ -+#endif -+extern void clean_exit __P((struct request_info *)); /* clean up and exit */ -+extern void refuse __P((struct request_info *)); /* clean up and exit */ -+extern char *xgets __P((char *, int, FILE *)); /* fgets() on steroids */ -+extern char *split_at __P((char *, int)); /* strchr() and split */ -+extern unsigned long dot_quad_addr __P((char *)); /* restricted inet_addr() */ - - /* Global variables. */ - -@@ -98,9 +120,14 @@ - */ - - #ifdef __STDC__ -+extern int hosts_access(struct request_info *request); -+extern int hosts_ctl(char *daemon, char *client_name, char *client_addr, -+ char *client_user); - extern struct request_info *request_init(struct request_info *,...); - extern struct request_info *request_set(struct request_info *,...); - #else -+extern int hosts_access(); -+extern int hosts_ctl(); - extern struct request_info *request_init(); /* initialize request */ - extern struct request_info *request_set(); /* update request structure */ - #endif -@@ -123,27 +150,27 @@ - * host_info structures serve as caches for the lookup results. - */ - --extern char *eval_user(); /* client user */ --extern char *eval_hostname(); /* printable hostname */ --extern char *eval_hostaddr(); /* printable host address */ --extern char *eval_hostinfo(); /* host name or address */ --extern char *eval_client(); /* whatever is available */ --extern char *eval_server(); /* whatever is available */ -+extern char *eval_user __P((struct request_info *)); /* client user */ -+extern char *eval_hostname __P((struct host_info *)); /* printable hostname */ -+extern char *eval_hostaddr __P((struct host_info *)); /* printable host address */ -+extern char *eval_hostinfo __P((struct host_info *)); /* host name or address */ -+extern char *eval_client __P((struct request_info *)); /* whatever is available */ -+extern char *eval_server __P((struct request_info *)); /* whatever is available */ - #define eval_daemon(r) ((r)->daemon) /* daemon process name */ - #define eval_pid(r) ((r)->pid) /* process id */ - - /* Socket-specific methods, including DNS hostname lookups. */ - --extern void sock_host(); /* look up endpoint addresses */ --extern void sock_hostname(); /* translate address to hostname */ --extern void sock_hostaddr(); /* address to printable address */ -+extern void sock_host __P((struct request_info *)); -+extern void sock_hostname __P((struct host_info *)); -+extern void sock_hostaddr __P((struct host_info *)); - #define sock_methods(r) \ - { (r)->hostname = sock_hostname; (r)->hostaddr = sock_hostaddr; } - - /* The System V Transport-Level Interface (TLI) interface. */ - - #if defined(TLI) || defined(PTX) || defined(TLI_SEQUENT) --extern void tli_host(); /* look up endpoint addresses etc. */ -+extern void tli_host __P((struct request_info *)); /* look up endpoint addresses etc. */ - #endif - - /* -@@ -184,7 +211,7 @@ - * behavior. - */ - --extern void process_options(); /* execute options */ -+extern void process_options __P((char *, struct request_info *)); /* execute options */ - extern int dry_run; /* verification flag */ - - /* Bug workarounds. */ -@@ -223,3 +250,7 @@ - #define strtok my_strtok - extern char *my_strtok(); - #endif -+ -+__END_DECLS -+ -+#endif /* tcpd.h */ diff --git a/databases/percona55-server/files/patch-libmysql_CMakeLists.txt b/databases/percona55-server/files/patch-libmysql_CMakeLists.txt new file mode 100644 index 000000000000..7f11bedc9e43 --- /dev/null +++ b/databases/percona55-server/files/patch-libmysql_CMakeLists.txt @@ -0,0 +1,36 @@ +--- libmysql/CMakeLists.txt.orig 2010-12-03 18:58:26.000000000 +0100 ++++ libmysql/CMakeLists.txt 2010-12-23 22:01:37.000000000 +0100 +@@ -153,13 +153,14 @@ + + # Merge several convenience libraries into one big mysqlclient + # and link them together into shared library. +-MERGE_LIBRARIES(mysqlclient STATIC ${LIBS} COMPONENT Development) ++MERGE_LIBRARIES(mysqlclient STATIC ${LIBS} COMPONENT Development NOINSTALL) + + # Visual Studio users need debug static library for debug projects + IF(MSVC) + INSTALL_DEBUG_TARGET(mysqlclient DESTINATION ${INSTALL_LIBDIR}/debug) + ENDIF() + ++IF(FALSE) + IF(UNIX) + MACRO(GET_VERSIONED_LIBNAME LIBNAME EXTENSION VERSION OUTNAME) + SET(DOT_VERSION ".${VERSION}") +@@ -174,9 +175,11 @@ + ENDMACRO() + INSTALL_SYMLINK(${CMAKE_STATIC_LIBRARY_PREFIX}mysqlclient_r.a mysqlclient ${INSTALL_LIBDIR} Development) + ENDIF() ++ENDIF() + + IF(NOT DISABLE_SHARED) +- MERGE_LIBRARIES(libmysql SHARED ${LIBS} EXPORTS ${CLIENT_API_FUNCTIONS} COMPONENT SharedLibraries) ++ MERGE_LIBRARIES(libmysql SHARED ${LIBS} EXPORTS ${CLIENT_API_FUNCTIONS} COMPONENT SharedLibraries NOINSTALL) ++IF(FALSE) + IF(UNIX) + # libtool compatability + IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE) +@@ -223,3 +226,4 @@ + ENDFOREACH() + ENDIF() + ENDIF() ++ENDIF() diff --git a/databases/percona55-server/files/patch-libservices_CMakeLists.txt b/databases/percona55-server/files/patch-libservices_CMakeLists.txt new file mode 100644 index 000000000000..fcbcea7aed21 --- /dev/null +++ b/databases/percona55-server/files/patch-libservices_CMakeLists.txt @@ -0,0 +1,9 @@ +--- libservices/CMakeLists.txt.orig 2010-12-23 17:13:03.000000000 +0100 ++++ libservices/CMakeLists.txt 2010-12-23 17:13:17.000000000 +0100 +@@ -22,4 +22,6 @@ + my_thread_scheduler_service.c) + + ADD_LIBRARY(mysqlservices ${MYSQLSERVICES_SOURCES}) ++IF(FALSE) + INSTALL(TARGETS mysqlservices DESTINATION ${INSTALL_LIBDIR} COMPONENT Development) ++ENDIF() diff --git a/databases/percona55-server/files/patch-man::Makefile.in b/databases/percona55-server/files/patch-man::Makefile.in deleted file mode 100644 index cebf7d7d08bf..000000000000 --- a/databases/percona55-server/files/patch-man::Makefile.in +++ /dev/null @@ -1,13 +0,0 @@ ---- 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@ --man1_MANS = @man1_files@ --man8_MANS = @man8_files@ -+man1_MANS = -+man8_MANS = - EXTRA_DIST = $(man1_MANS) $(man8_MANS) CMakeLists.txt - all: all-am - diff --git a/databases/percona55-server/files/patch-scripts::Makefile.in b/databases/percona55-server/files/patch-scripts::Makefile.in deleted file mode 100644 index a8fb0cbf469a..000000000000 --- a/databases/percona55-server/files/patch-scripts::Makefile.in +++ /dev/null @@ -1,37 +0,0 @@ ---- 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_extensions \ -- mysql_setpermission \ -- mysql_secure_installation \ -- mysql_zap \ -- mysqlaccess \ -- mysqlbug \ -- mysql_convert_table_format \ -- mysql_find_rows \ -- mysqlhotcopy \ -- mysqldumpslow \ -- mysqld_multi -+bin_SCRIPTS = - - noinst_SCRIPTS = make_binary_distribution \ - make_sharedlib_distribution \ -@@ -439,11 +426,7 @@ - mysql_system_tables_fix.sql \ - CMakeLists.txt - --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 = - - CLEANFILES = @server_scripts@ \ - make_binary_distribution \ diff --git a/databases/percona55-server/files/patch-scripts_CMakeLists.txt b/databases/percona55-server/files/patch-scripts_CMakeLists.txt new file mode 100644 index 000000000000..9c9ce95a8209 --- /dev/null +++ b/databases/percona55-server/files/patch-scripts_CMakeLists.txt @@ -0,0 +1,19 @@ +--- scripts/CMakeLists.txt.orig 2010-12-23 17:38:12.000000000 +0100 ++++ scripts/CMakeLists.txt 2010-12-23 17:40:29.000000000 +0100 +@@ -316,16 +316,11 @@ + # On Unix, most of the files end up in the bin directory + SET(mysql_config_COMPONENT COMPONENT Development) + SET(BIN_SCRIPTS +- msql2mysql +- mysql_config + mysql_fix_extensions + mysql_setpermission + mysql_secure_installation + mysql_zap +- mysqlaccess +- mysqlaccess.conf + mysql_convert_table_format +- mysql_find_rows + mysqlhotcopy + mysqldumpslow + mysqld_multi diff --git a/databases/percona55-server/files/patch-sql::mysqld.cc b/databases/percona55-server/files/patch-sql::mysqld.cc deleted file mode 100644 index 4feed825cb11..000000000000 --- a/databases/percona55-server/files/patch-sql::mysqld.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- sql/mysqld.cc.orig Sat Aug 6 03:39:41 2005 -+++ sql/mysqld.cc Sun Aug 28 20:41:38 2005 -@@ -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 --git a/databases/percona55-server/files/patch-sql_CMakeLists.txt b/databases/percona55-server/files/patch-sql_CMakeLists.txt new file mode 100644 index 000000000000..e4d1b520c529 --- /dev/null +++ b/databases/percona55-server/files/patch-sql_CMakeLists.txt @@ -0,0 +1,18 @@ +--- sql/CMakeLists.txt.orig 2010-12-23 17:31:28.000000000 +0100 ++++ sql/CMakeLists.txt 2010-12-23 17:33:36.000000000 +0100 +@@ -245,6 +245,7 @@ + + IF(INSTALL_LAYOUT STREQUAL "STANDALONE") + ++IF(FALSE) + # We need to create empty directories (data/test) the installation. + # This does not work with current CPack due to http://www.cmake.org/Bug/view.php?id=8767 + # Avoid completely empty directories and install dummy file instead. +@@ -286,6 +287,7 @@ + INSTALL(FILES ${DUMMY_FILE} DESTINATION data/mysql COMPONENT DataFiles) + ENDIF() + ENDIF() ++ENDIF() + + ADD_CUSTOM_TARGET(show-dist-name + COMMAND ${CMAKE_COMMAND} -E echo "${CPACK_PACKAGE_FILE_NAME}" diff --git a/databases/percona55-server/files/patch-support-files_CMakeLists.txt b/databases/percona55-server/files/patch-support-files_CMakeLists.txt new file mode 100644 index 000000000000..159e1fa71ba2 --- /dev/null +++ b/databases/percona55-server/files/patch-support-files_CMakeLists.txt @@ -0,0 +1,12 @@ +--- support-files/CMakeLists.txt.orig 2010-12-23 17:38:19.000000000 +0100 ++++ support-files/CMakeLists.txt 2010-12-23 17:41:11.000000000 +0100 +@@ -74,7 +74,9 @@ + INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles) + ENDIF() + ++IF(FALSE) + INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development) ++ENDIF() + CONFIGURE_FILE(MySQL-shared-compat.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/MySQL-shared-compat.spec @ONLY) + CONFIGURE_FILE(mysql.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/mysql.spec @ONLY) + CONFIGURE_FILE(mysql.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/mysql.${VERSION}.spec @ONLY) diff --git a/databases/percona55-server/files/patch-support-files_Makefile.in b/databases/percona55-server/files/patch-support-files_Makefile.in deleted file mode 100644 index 2d6ef213f891..000000000000 --- a/databases/percona55-server/files/patch-support-files_Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- 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-@VERSION@.spec \ - MySQL-shared-compat.spec - diff --git a/databases/percona55-server/pkg-plist b/databases/percona55-server/pkg-plist index a3be0242fbf5..c2cb047a9efe 100644 --- a/databases/percona55-server/pkg-plist +++ b/databases/percona55-server/pkg-plist @@ -5,57 +5,39 @@ bin/myisam_ftdump bin/myisamchk bin/myisamlog bin/myisampack -bin/mysqltest_embedded -bin/mysql_client_test_embedded +bin/mysql_convert_table_format +bin/mysql_fix_extensions bin/mysql_install_db +bin/mysql_secure_installation +bin/mysql_setpermission bin/mysql_tzinfo_to_sql -bin/mysql_waitpid +bin/mysql_upgrade +bin/mysql_zap +bin/mysqlbug +bin/mysqld_multi bin/mysqld_safe +bin/mysqldumpslow +bin/mysqlhotcopy +bin/mysqltest bin/perror bin/replace bin/resolve_stack_dump bin/resolveip -lib/mysql/libdbug.a -lib/mysql/libheap.a -lib/mysql/libmyisam.a -lib/mysql/libmyisammrg.a -lib/mysql/libmysqld.a -lib/mysql/libmysqlservices.a -lib/mysql/libmystrings.a -lib/mysql/libmysys.a -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/auth_test_plugin.a -%%PLUGINS%%lib/mysql/plugin/auth_test_plugin.la -%%PLUGINS%%lib/mysql/plugin/auth_test_plugin.so -%%PLUGINS%%lib/mysql/plugin/auth_test_plugin.so.0 -%%PLUGINS%%lib/mysql/plugin/auth.a -%%PLUGINS%%lib/mysql/plugin/auth.la -%%PLUGINS%%lib/mysql/plugin/auth.so -%%PLUGINS%%lib/mysql/plugin/auth.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.a -%%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/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_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 +lib/mysql/plugin/adt_null.so +lib/mysql/plugin/auth.so +lib/mysql/plugin/auth_test_plugin.so +lib/mysql/plugin/ha_archive.so +lib/mysql/plugin/ha_blackhole.so +lib/mysql/plugin/ha_example.so +lib/mysql/plugin/ha_federated.so +lib/mysql/plugin/libdaemon_example.so +lib/mysql/plugin/mypluglib.so +lib/mysql/plugin/qa_auth_client.so +lib/mysql/plugin/qa_auth_interface.so +lib/mysql/plugin/qa_auth_server.so +lib/mysql/plugin/semisync_master.so +lib/mysql/plugin/semisync_slave.so +lib/libmysqld.a libexec/mysqld %%DATADIR%%/binary-configure %%DATADIR%%/charsets/Index.xml @@ -101,17 +83,17 @@ libexec/mysqld %%DATADIR%%/italian/errmsg.sys %%DATADIR%%/japanese/errmsg.sys %%DATADIR%%/korean/errmsg.sys -%%DATADIR%%/mi_test_all -%%DATADIR%%/mi_test_all.res +%%DATADIR%%/magic %%DATADIR%%/my-huge.cnf %%DATADIR%%/my-innodb-heavy-4G.cnf %%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%%/mysql_system_tables.sql +%%DATADIR%%/mysql_system_tables_data.sql +%%DATADIR%%/mysql_test_data_timezone.sql %%DATADIR%%/mysqld_multi.server %%DATADIR%%/ndb-config-2-node.ini %%DATADIR%%/norwegian-ny/errmsg.sys @@ -125,9 +107,8 @@ libexec/mysqld %%DATADIR%%/spanish/errmsg.sys %%DATADIR%%/swedish/errmsg.sys %%DATADIR%%/ukrainian/errmsg.sys -@dirrmtry include/mysql -@dirrmtry lib/mysql/plugin -@dirrmtry lib/mysql +@dirrm lib/mysql/plugin +@dirrm lib/mysql @dirrm %%DATADIR%%/charsets @dirrm %%DATADIR%%/czech @dirrm %%DATADIR%%/danish @@ -152,4 +133,4 @@ libexec/mysqld @dirrm %%DATADIR%%/spanish @dirrm %%DATADIR%%/swedish @dirrm %%DATADIR%%/ukrainian -@dirrmtry %%DATADIR%% +@dirrm %%DATADIR%% diff --git a/databases/percona55-server/pkg-plist.client b/databases/percona55-server/pkg-plist.client deleted file mode 100644 index a374b9949e8c..000000000000 --- a/databases/percona55-server/pkg-plist.client +++ /dev/null @@ -1,73 +0,0 @@ -bin/mysql -bin/mysql_config -bin/mysql_upgrade -bin/mysqladmin -bin/mysqlbinlog -bin/mysqlbug -bin/mysqlcheck -bin/mysqldump -bin/mysqlimport -bin/mysqlshow -bin/mysqlslap -bin/mysqltest -include/mysql/client_plugin.h -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_compiler.h -include/mysql/my_config.h -include/mysql/my_dbug.h -include/mysql/my_dir.h -include/mysql/my_getopt.h -include/mysql/my_global.h -include/mysql/my_list.h -include/mysql/my_net.h -include/mysql/my_no_pthread.h -include/mysql/my_pthread.h -include/mysql/my_sys.h -include/mysql/my_xml.h -include/mysql/mysql.h -include/mysql/mysql_com.h -include/mysql/mysql_embed.h -include/mysql/mysql_time.h -include/mysql/mysql_version.h -include/mysql/mysqld_ername.h -include/mysql/mysqld_error.h -include/mysql/plugin_audit.h -include/mysql/plugin_auth_common.h -include/mysql/plugin_auth.h -include/mysql/plugin_ftparser.h -include/mysql/plugin.h -include/mysql/probes_mysql.h -include/mysql/probes_mysql_nodtrace.h -include/mysql/psi/mysql_file.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 -include/mysql/service_thd_wait.h -include/mysql/service_thread_scheduler.h -include/mysql/sql_common.h -include/mysql/sql_state.h -include/mysql/sslopt-case.h -include/mysql/sslopt-longopts.h -include/mysql/sslopt-vars.h -include/mysql/typelib.h -lib/mysql/libmysqlclient.a -lib/mysql/libmysqlclient.la -lib/mysql/libmysqlclient.so -lib/mysql/libmysqlclient.so.16 -lib/mysql/libmysqlclient_r.a -lib/mysql/libmysqlclient_r.la -lib/mysql/libmysqlclient_r.so -lib/mysql/libmysqlclient_r.so.16 -share/aclocal/mysql.m4 -@dirrm include/mysql/psi -@dirrm include/mysql -@dirrm lib/mysql -@dirrmtry %%DATADIR%% diff --git a/databases/percona55-server/pkg-plist.scripts b/databases/percona55-server/pkg-plist.scripts deleted file mode 100644 index b0a603760ef0..000000000000 --- a/databases/percona55-server/pkg-plist.scripts +++ /dev/null @@ -1,11 +0,0 @@ -bin/msql2mysql -bin/mysql_convert_table_format -bin/mysql_find_rows -bin/mysql_fix_extensions -bin/mysql_secure_installation -bin/mysql_setpermission -bin/mysql_zap -bin/mysqlaccess -bin/mysqld_multi -bin/mysqldumpslow -bin/mysqlhotcopy |