Index: Makefile =================================================================== --- Makefile (revision 499081) +++ Makefile (working copy) @@ -2,9 +2,9 @@ # $FreeBSD$ PORTNAME= mysqlwsrep -PORTVERSION?= 5.7.24 +PORTVERSION?= 5.7.25 DISTVERSIONPREFIX?= wsrep_ -DISTVERSIONSUFFIX?= -25.16 +DISTVERSIONSUFFIX?= -25.17 CATEGORIES= databases ipv6 MASTER_SITES+= SF/boost/boost/1.59.0:boost PKGNAMESUFFIX= 57-server @@ -45,7 +45,7 @@ DATADIR= ${PREFIX}/share/mysql ETCDIR= ${PREFIX}/etc/mysql -NOT_FOR_ARCHS= aarch64 armv6 armv7 powerpc64 +NOT_FOR_ARCHS= i386 aarch64 armv6 armv7 powerpc64 NOT_FOR_ARCHS_REASON= Not supported platform CMAKE_ARGS+= -DINSTALL_LAYOUT=FREEBSD \ Index: distinfo =================================================================== --- distinfo (revision 499081) +++ distinfo (working copy) @@ -1,7 +1,7 @@ -TIMESTAMP = 1544528045 +TIMESTAMP = 1555424200 SHA256 (boost_1_59_0.tar.gz) = 47f11c8844e579d02691a607fbd32540104a9ac7a2534a8ddaef50daf502baac SIZE (boost_1_59_0.tar.gz) = 83709983 -SHA256 (codership-mysql-wsrep-wsrep_5.7.24-25.16_GH0.tar.gz) = 228b0da8414bf79eb5332ad9d5c64a377fe25adf081b6591c927c7315d97893d -SIZE (codership-mysql-wsrep-wsrep_5.7.24-25.16_GH0.tar.gz) = 52312878 +SHA256 (codership-mysql-wsrep-wsrep_5.7.25-25.17_GH0.tar.gz) = 87c1ef4277a60c36166b737813d4898ace7797870fa813d514107133ea257260 +SIZE (codership-mysql-wsrep-wsrep_5.7.25-25.17_GH0.tar.gz) = 52350103 SHA256 (codership-wsrep-API-eab2d5d5a31672c0b7d116ef1629ff18392fd7d0_GH0.tar.gz) = 3c235868ed330d8d702e7b7541c24c1926b1fd9e6b8aa673b032a2318896e8a0 SIZE (codership-wsrep-API-eab2d5d5a31672c0b7d116ef1629ff18392fd7d0_GH0.tar.gz) = 47032 Index: files/patch-libmysql_CMakeLists.txt =================================================================== --- files/patch-libmysql_CMakeLists.txt (revision 499081) +++ files/patch-libmysql_CMakeLists.txt (working copy) @@ -1,7 +1,13 @@ ---- libmysql/CMakeLists.txt.orig 2018-01-23 20:34:50.742425000 +0200 -+++ libmysql/CMakeLists.txt 2018-01-23 20:36:13.066280000 +0200 -@@ -235,7 +235,7 @@ - ADD_SUBDIRECTORY(authentication_ldap) +--- libmysql/CMakeLists.txt.orig 2019-03-22 10:07:57 UTC ++++ libmysql/CMakeLists.txt +@@ -231,11 +231,11 @@ IF(WIN32) + ENDIF() + + # LDAP authentication SASL client plugin +-MESSAGE(STATUS "Creating LDAP authentication SASL client library.") +-ADD_SUBDIRECTORY(authentication_ldap) ++# MESSAGE(STATUS "Creating LDAP authentication SASL client library.") ++# ADD_SUBDIRECTORY(authentication_ldap) # Merge several convenience libraries into one big mysqlclient -MERGE_CONVENIENCE_LIBRARIES(mysqlclient ${LIBS} COMPONENT Development) @@ -9,7 +15,7 @@ # Visual Studio users need debug static library for debug projects IF(MSVC) -@@ -271,7 +271,8 @@ +@@ -284,7 +284,8 @@ IF(NOT DISABLE_SHARED) # and link them together into shared library. MERGE_LIBRARIES_SHARED(libmysql ${LIBS} EXPORTS ${CLIENT_API_FUNCTIONS} ${CLIENT_API_FUNCTIONS_UNDOCUMENTED} @@ -19,11 +25,11 @@ IF(UNIX) # libtool compatability IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE) -@@ -316,6 +317,7 @@ +@@ -328,6 +329,7 @@ IF(NOT DISABLE_SHARED) + SET_TARGET_PROPERTIES(mysqlclient PROPERTIES CLEAN_DIRECT_OUTPUT 1) SET_TARGET_PROPERTIES(libmysql PROPERTIES CLEAN_DIRECT_OUTPUT 1) ++ ENDIF() ENDIF() -+ ENDIF() ENDIF() - #