View | Details | Raw Unified | Return to bug 240346
Collapse All | Expand All

(-)Makefile (-2 / +2 lines)
Lines 2-10 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	mysqlwsrep
4
PORTNAME=	mysqlwsrep
5
PORTVERSION?=	5.7.26
5
PORTVERSION?=	5.7.27
6
DISTVERSIONPREFIX?=	wsrep_
6
DISTVERSIONPREFIX?=	wsrep_
7
DISTVERSIONSUFFIX?=	-25.18
7
DISTVERSIONSUFFIX?=	-25.19
8
PORTREVISION?=	1
8
PORTREVISION?=	1
9
CATEGORIES=	databases ipv6
9
CATEGORIES=	databases ipv6
10
MASTER_SITES+=	SF/boost/boost/1.59.0:boost
10
MASTER_SITES+=	SF/boost/boost/1.59.0:boost
(-)distinfo (-3 / +3 lines)
Lines 1-7 Link Here
1
TIMESTAMP = 1563530272
1
TIMESTAMP = 1567528044
2
SHA256 (boost_1_59_0.tar.gz) = 47f11c8844e579d02691a607fbd32540104a9ac7a2534a8ddaef50daf502baac
2
SHA256 (boost_1_59_0.tar.gz) = 47f11c8844e579d02691a607fbd32540104a9ac7a2534a8ddaef50daf502baac
3
SIZE (boost_1_59_0.tar.gz) = 83709983
3
SIZE (boost_1_59_0.tar.gz) = 83709983
4
SHA256 (codership-mysql-wsrep-wsrep_5.7.26-25.18_GH0.tar.gz) = 91d44918284e2f8e5ec7aabbf15e0c7ccefefd32a7a0206494d16ea8216098fc
4
SHA256 (codership-mysql-wsrep-wsrep_5.7.27-25.19_GH0.tar.gz) = 2d4907d107fe6ea714a34da7b7e86c9cc7e53a445341ca2bb36e79f917266b16
5
SIZE (codership-mysql-wsrep-wsrep_5.7.26-25.18_GH0.tar.gz) = 54333146
5
SIZE (codership-mysql-wsrep-wsrep_5.7.27-25.19_GH0.tar.gz) = 54689025
6
SHA256 (codership-wsrep-API-eab2d5d5a31672c0b7d116ef1629ff18392fd7d0_GH0.tar.gz) = 3c235868ed330d8d702e7b7541c24c1926b1fd9e6b8aa673b032a2318896e8a0
6
SHA256 (codership-wsrep-API-eab2d5d5a31672c0b7d116ef1629ff18392fd7d0_GH0.tar.gz) = 3c235868ed330d8d702e7b7541c24c1926b1fd9e6b8aa673b032a2318896e8a0
7
SIZE (codership-wsrep-API-eab2d5d5a31672c0b7d116ef1629ff18392fd7d0_GH0.tar.gz) = 47032
7
SIZE (codership-wsrep-API-eab2d5d5a31672c0b7d116ef1629ff18392fd7d0_GH0.tar.gz) = 47032
(-)files/patch-CMakeLists.txt (-5 / +5 lines)
Lines 1-6 Link Here
1
--- CMakeLists.txt.orig	2019-07-17 18:38:36 UTC
1
--- CMakeLists.txt.orig	2019-08-30 12:42:21 UTC
2
+++ CMakeLists.txt
2
+++ CMakeLists.txt
3
@@ -691,12 +691,10 @@ IF(UNIX)
3
@@ -710,12 +710,10 @@ IF(UNIX)
4
 ENDIF()
4
 ENDIF()
5
 
5
 
6
 IF(NOT WITHOUT_SERVER)
6
 IF(NOT WITHOUT_SERVER)
Lines 13-19 Link Here
13
   ENDIF(WITH_EMBEDDED_SERVER)
13
   ENDIF(WITH_EMBEDDED_SERVER)
14
 ENDIF()
14
 ENDIF()
15
 
15
 
16
@@ -705,8 +703,6 @@ ENDIF()
16
@@ -724,8 +722,6 @@ ENDIF()
17
 ADD_SUBDIRECTORY(scripts)
17
 ADD_SUBDIRECTORY(scripts)
18
 
18
 
19
 IF(NOT WITHOUT_SERVER)
19
 IF(NOT WITHOUT_SERVER)
Lines 22-28 Link Here
22
   ADD_SUBDIRECTORY(support-files)
22
   ADD_SUBDIRECTORY(support-files)
23
   IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt)
23
   IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt)
24
     ADD_SUBDIRECTORY(internal)
24
     ADD_SUBDIRECTORY(internal)
25
@@ -765,6 +761,7 @@ ENDIF()
25
@@ -784,6 +780,7 @@ ENDIF()
26
 #
26
 #
27
 # RPM installs documentation directly from the source tree
27
 # RPM installs documentation directly from the source tree
28
 #
28
 #
Lines 30-36 Link Here
30
 IF(NOT INSTALL_LAYOUT MATCHES "RPM")
30
 IF(NOT INSTALL_LAYOUT MATCHES "RPM")
31
   INSTALL(FILES COPYING LICENSE.mysql 
31
   INSTALL(FILES COPYING LICENSE.mysql 
32
   DESTINATION ${INSTALL_DOCREADMEDIR} 
32
   DESTINATION ${INSTALL_DOCREADMEDIR} 
33
@@ -788,6 +785,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
33
@@ -807,6 +804,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
34
     PATTERN "mysql.info" EXCLUDE
34
     PATTERN "mysql.info" EXCLUDE
35
     PATTERN "sp-imp-spec.txt" EXCLUDE
35
     PATTERN "sp-imp-spec.txt" EXCLUDE
36
   )
36
   )
(-)files/patch-scripts_CMakeLists.txt (-7 / +7 lines)
Lines 1-15 Link Here
1
--- scripts/CMakeLists.txt.orig	2019-07-17 18:38:36 UTC
1
--- scripts/CMakeLists.txt.orig	2019-08-30 12:42:21 UTC
2
+++ scripts/CMakeLists.txt
2
+++ scripts/CMakeLists.txt
3
@@ -324,6 +324,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var)
3
@@ -326,6 +326,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var)
4
           GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE)
4
           GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE)
5
           STRING(REGEX REPLACE "^lib" "" lib "${lib}")
5
           STRING(REGEX REPLACE "^lib" "" lib "${lib}")
6
           SET(${var} "${${var}}-l${lib} " ) 
6
           SET(${var} "${${var}}-l${lib} " )
7
+        ELSEIF(lib STREQUAL "-pthread")
7
+        ELSEIF(lib STREQUAL "-pthread")
8
+          SET(${var} "${${var}}-pthread " ) 
8
+          SET(${var} "${${var}}-pthread " )
9
         ELSE()
9
         ELSE()
10
           SET(${var} "${${var}}-l${lib} " ) 
10
           SET(${var} "${${var}}-l${lib} " )
11
         ENDIF()
11
         ENDIF()
12
@@ -409,14 +411,13 @@ ELSE()
12
@@ -411,14 +413,13 @@ ELSE()
13
   # On Unix, most of the files end up in the bin directory
13
   # On Unix, most of the files end up in the bin directory
14
   SET(mysql_config_COMPONENT COMPONENT Development)
14
   SET(mysql_config_COMPONENT COMPONENT Development)
15
 
15
 
Lines 25-31 Link Here
25
       mysqldumpslow
25
       mysqldumpslow
26
       mysqld_multi
26
       mysqld_multi
27
       mysqld_safe
27
       mysqld_safe
28
@@ -460,7 +461,7 @@ ELSE()
28
@@ -462,7 +463,7 @@ ELSE()
29
   FOREACH(file ${BIN_SCRIPTS})
29
   FOREACH(file ${BIN_SCRIPTS})
30
     IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh)
30
     IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh)
31
       CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh
31
       CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh

Return to bug 240346