Revision: 100251 https://trac.macports.org/changeset/100251 Author: pixilla@macports.org Date: 2012-12-05 13:25:16 -0800 (Wed, 05 Dec 2012) Log Message: ----------- databases/mariadb: - Update version to 5.5.28a. - Remove/update patch files. - Remove unused/unneeded configure args. Modified Paths: -------------- trunk/dports/databases/mariadb/Portfile trunk/dports/databases/mariadb/files/patch-CMakeLists.txt.diff trunk/dports/databases/mariadb/files/patch-cmake-install_layout.cmake.diff Removed Paths: ------------- trunk/dports/databases/mariadb/files/patch-storage-maria-CMakeLists.txt.diff trunk/dports/databases/mariadb/files/patch-storage-perfschema-CMakeLists.txt.diff Modified: trunk/dports/databases/mariadb/Portfile =================================================================== --- trunk/dports/databases/mariadb/Portfile 2012-12-05 20:36:05 UTC (rev 100250) +++ trunk/dports/databases/mariadb/Portfile 2012-12-05 21:25:16 UTC (rev 100251) @@ -5,9 +5,9 @@ name mariadb set name_mysql ${name} -version 5.5.25 +version 5.5.28a # Please set revision_client and revision_server to 0 if you bump version. -set revision_client 1 +set revision_client 0 set revision_server 0 categories databases platforms darwin @@ -43,12 +43,10 @@ patch.pre_args -p1 patchfiles patch-cmake-install_layout.cmake.diff \ - patch-storage-maria-CMakeLists.txt.diff \ - patch-storage-perfschema-CMakeLists.txt.diff \ patch-CMakeLists.txt.diff - checksums rmd160 9ba60ac2d768b4f89b76ed65f14de3c18e8590b2 \ - sha256 40de17d2a54e1bd6da55144054c170b330d8e5281b236939238ff3574404bddb + checksums rmd160 f2967e11b174866c1077cc197e98eb23c3a278d2 \ + sha256 66c908592763c641f2a1e9fd83f080458a0d3375cda9aaf7700a37877b1e9968 depends_lib-append port:zlib port:tcp_wrappers depends_run-append port:mysql_select @@ -96,14 +94,9 @@ -DENABLE_GCOV:BOOL=OFF \ -DENABLE_DTRACE:BOOL=OFF \ -DWITH_READLINE:BOOL=ON \ - -DWITH_LIBEDIT:BOOL=OFF \ -DWITH_LIBWRAP:BOOL=ON \ -DWITH_SSL:STRING=no - # OQGraph storage engine does not currently compile - configure.args-append \ - -DWITHOUT_OQGRAPH:BOOL=YES - post-build { set dirs ${worksrcpath}/build_macports foreach dir ${dirs} { Modified: trunk/dports/databases/mariadb/files/patch-CMakeLists.txt.diff =================================================================== --- trunk/dports/databases/mariadb/files/patch-CMakeLists.txt.diff 2012-12-05 20:36:05 UTC (rev 100250) +++ trunk/dports/databases/mariadb/files/patch-CMakeLists.txt.diff 2012-12-05 21:25:16 UTC (rev 100251) @@ -1,11 +1,12 @@ ---- a/CMakeLists.txt 2012-06-26 07:26:41.000000000 -0700 -+++ b/CMakeLists.txt 2012-06-26 07:28:00.000000000 -0700 -@@ -241,8 +241,8 @@ +--- a/CMakeLists.txt 2012-12-05 10:22:51.000000000 -0800 ++++ b/CMakeLists.txt 2012-12-05 10:24:15.000000000 -0800 +@@ -248,6 +248,9 @@ + IF(INSTALL_SYSCONFDIR) + SET(DEFAULT_SYSCONFDIR "${INSTALL_SYSCONFDIR}") ENDIF() - SET(DEFAULT_CHARSET_HOME "${DEFAULT_MYSQL_HOME}") - SET(PLUGINDIR "${DEFAULT_MYSQL_HOME}/${INSTALL_PLUGINDIR}") --IF(INSTALL_SYSCONFDIR) -- SET(DEFAULT_SYSCONFDIR "${INSTALL_SYSCONFDIR}") +IF(SYSCONFDIR) + SET(DEFAULT_SYSCONFDIR "${SYSCONFDIR}") - ENDIF() ++ENDIF() + + + # Run platform tests Modified: trunk/dports/databases/mariadb/files/patch-cmake-install_layout.cmake.diff =================================================================== --- trunk/dports/databases/mariadb/files/patch-cmake-install_layout.cmake.diff 2012-12-05 20:36:05 UTC (rev 100250) +++ trunk/dports/databases/mariadb/files/patch-cmake-install_layout.cmake.diff 2012-12-05 21:25:16 UTC (rev 100251) @@ -1,5 +1,5 @@ ---- a/cmake/install_layout.cmake 2012-06-09 10:56:48.000000000 -0700 -+++ b/cmake/install_layout.cmake 2012-06-09 18:27:32.000000000 -0700 +--- a/cmake/install_layout.cmake 2012-12-05 07:50:37.000000000 -0800 ++++ b/cmake/install_layout.cmake 2012-12-05 07:48:31.000000000 -0800 @@ -71,7 +71,7 @@ ENDIF() @@ -9,7 +9,7 @@ IF(UNIX) IF(INSTALL_LAYOUT MATCHES "RPM") -@@ -89,7 +89,7 @@ +@@ -87,7 +87,7 @@ SET(CMAKE_INSTALL_PREFIX ${default_prefix} CACHE PATH "install prefix" FORCE) ENDIF() @@ -18,7 +18,7 @@ LIST(FIND VALID_INSTALL_LAYOUTS "${INSTALL_LAYOUT}" ind) IF(ind EQUAL -1) MESSAGE(FATAL_ERROR "Invalid INSTALL_LAYOUT parameter:${INSTALL_LAYOUT}." -@@ -219,6 +219,31 @@ +@@ -217,6 +217,31 @@ SET(INSTALL_PLUGINTESTDIR_SVR4 ${plugin_tests}) SET(INSTALL_UNIX_ADDRDIR_SVR "/tmp/mysql.sock") Deleted: trunk/dports/databases/mariadb/files/patch-storage-maria-CMakeLists.txt.diff =================================================================== --- trunk/dports/databases/mariadb/files/patch-storage-maria-CMakeLists.txt.diff 2012-12-05 20:36:05 UTC (rev 100250) +++ trunk/dports/databases/mariadb/files/patch-storage-maria-CMakeLists.txt.diff 2012-12-05 21:25:16 UTC (rev 100251) @@ -1,11 +0,0 @@ ---- a/storage/maria/CMakeLists.txt 2012-06-09 10:56:52.000000000 -0700 -+++ b/storage/maria/CMakeLists.txt 2012-06-10 14:30:33.000000000 -0700 -@@ -92,4 +92,7 @@ - CMAKE_DEPENDENT_OPTION(USE_ARIA_FOR_TMP_TABLES "Use Aria for temporary tables" ON - "WITH_ARIA_STORAGE_ENGINE" OFF) - --ADD_SUBDIRECTORY(unittest) -+IF(WITH_MARIA_STORAGE_ENGINE) -+ ENABLE_TESTING() -+ ADD_SUBDIRECTORY(unittest) -+ENDIF() Deleted: trunk/dports/databases/mariadb/files/patch-storage-perfschema-CMakeLists.txt.diff =================================================================== --- trunk/dports/databases/mariadb/files/patch-storage-perfschema-CMakeLists.txt.diff 2012-12-05 20:36:05 UTC (rev 100250) +++ trunk/dports/databases/mariadb/files/patch-storage-perfschema-CMakeLists.txt.diff 2012-12-05 21:25:16 UTC (rev 100251) @@ -1,11 +0,0 @@ ---- a/storage/perfschema/CMakeLists.txt 2012-06-09 10:56:53.000000000 -0700 -+++ b/storage/perfschema/CMakeLists.txt 2012-06-10 14:23:06.000000000 -0700 -@@ -74,6 +74,7 @@ - ) - - MYSQL_ADD_PLUGIN(perfschema ${PERFSCHEMA_SOURCES} STORAGE_ENGINE DEFAULT STATIC_ONLY) --IF(WITH_PERFSCHEMA_STORAGE_ENGINE) -+IF(WITH_PERFSCHEMA_STORAGE_ENGINE AND WITH_UNIT_TESTS) -+ ENABLE_TESTING() - ADD_SUBDIRECTORY(unittest) - ENDIF()