Attachment #215662 for bug #247348

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




# $FreeBSD$

PORTNAME=	mysqlwsrep
PORTVERSION?=	5.7.30
DISTVERSIONPREFIX?=	wsrep_
DISTVERSIONSUFFIX?=	-25.22
PORTREVISION?=	0
CATEGORIES=	databases
MASTER_SITES+=	SF/boost/boost/1.59.0:boost

LICENSE=	GPLv2

RUN_DEPENDS=	bash:shells/bash \
		lsof:sysutils/lsof \
		netcat:net/netcat \
		rsync:net/rsync \
		socat:net/socat
LIB_DEPENDS=	libevent.so:devel/libevent liblz4.so:archivers/liblz4

		-DINSTALL_MYSQLDATADIR="${MY_DBDIR}" \
		-DINSTALL_MYSQLKEYRINGDIR="etc/mysql/keyring" \
		-DINSTALL_MYSQLSHAREDIR="share/mysql" \
		-DINSTALL_MYSQLTESTDIR="share/mysql/tests" \
		-DINSTALL_PLUGINDIR="lib/mysql/plugin" \
		-DINSTALL_SBINDIR="libexec" \
		-DINSTALL_SCRIPTDIR="bin" \

Lines 1-7 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1571904382	1	TIMESTAMP = 1591201597
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.28-25.20_GH0.tar.gz) = ba03e5e35a1e972b3887935e1a13c93c30dfa44bb4d85b5f8dde2f9c982b3ff8	4	SHA256 (codership-mysql-wsrep-wsrep_5.7.30-25.22_GH0.tar.gz) = 2fb00a0b6f644b1f37bdc2cdbee5f090fbc0377e66b06dbe1971943097a35658
5	SIZE (codership-mysql-wsrep-wsrep_5.7.28-25.20_GH0.tar.gz) = 54717971	5	SIZE (codership-mysql-wsrep-wsrep_5.7.30-25.22_GH0.tar.gz) = 54733023
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




--- CMakeLists.txt.orig	2020-05-27 10:17:47 UTC
+++ CMakeLists.txt
@@ -738,12 +738,10 @@ IF(UNIX)
 ENDIF()
 
 IF(NOT WITHOUT_SERVER)

   ENDIF(WITH_EMBEDDED_SERVER)
 ENDIF()
 
@@ -752,8 +750,6 @@ ENDIF()
 ADD_SUBDIRECTORY(scripts)
 
 IF(NOT WITHOUT_SERVER)

   ADD_SUBDIRECTORY(support-files)
   IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt)
     ADD_SUBDIRECTORY(internal)
@@ -812,6 +808,7 @@ ENDIF()
 #
 # RPM installs documentation directly from the source tree
 #

 IF(NOT INSTALL_LAYOUT MATCHES "RPM")
   INSTALL(FILES
     README
@@ -833,6 +830,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
     PATTERN "mysql.info" EXCLUDE
     PATTERN "sp-imp-spec.txt" EXCLUDE
   )

Lines 1-6 Link Here

(-)files/patch-cmake_ssl.cmake (-2 / +2 lines)
1	--- cmake/ssl.cmake.orig 2019-10-21 05:21:41 UTC	1	--- cmake/ssl.cmake.orig 2020-05-27 10:17:47 UTC
2	+++ cmake/ssl.cmake	2	+++ cmake/ssl.cmake
3	@@ -202,6 +202,12 @@ MACRO (MYSQL_CHECK_SSL)	3	@@ -206,6 +206,12 @@ MACRO (MYSQL_CHECK_SSL)
4	OPENSSL_MAJOR_VERSION STREQUAL "1"	4	OPENSSL_MAJOR_VERSION STREQUAL "1"
5	)	5	)
6	SET(OPENSSL_FOUND TRUE)	6	SET(OPENSSL_FOUND TRUE)

Lines 1-11 Link Here

(-)files/patch-cmd-line-utils_libedit_chartype.h (-11 lines)
1	--- cmd-line-utils/libedit/chartype.h.orig 2016-03-28 18:06:12 UTC
2	+++ cmd-line-utils/libedit/chartype.h
3	@@ -49,7 +49,7 @@
4	TODO : Verify if FreeBSD & AIX stores ISO 10646 in wchar_t. */
5	#if !defined(__NetBSD__) && !defined(__sun) \
6	&& !(defined(__APPLE__) && defined(__MACH__)) \
7	- && !defined(__FreeBSD__) && !defined(_AIX)
8	+ && !defined(__FreeBSD__) && !defined(_AIX) && !defined(__DragonFly__)
9	#ifndef __STDC_ISO_10646__
10	/* In many places it is assumed that the first 127 code points are ASCII
11	* compatible, so ensure wchar_t indeed does ISO 10646 and not some other




--- cmd-line-utils/libedit/vi.c.orig	2016-03-28 18:06:12 UTC
+++ cmd-line-utils/libedit/vi.c
@@ -919,7 +919,7 @@ vi_comment_out(EditLine *el, Int c __att
  * NB: posix implies that we should enter insert mode, however
  * this is against historical precedent...
  */
-#if defined(__weak_reference) && !defined(__FreeBSD__)
+#if defined(__weak_reference) && !defined(__FreeBSD__) && !defined(__DragonFly__)
 __weakref_visible char *my_get_alias_text(const char *)
     __weak_reference(get_alias_text);
 #endif
@@ -928,7 +928,7 @@ protected el_action_t
 vi_alias(EditLine *el __attribute__((__unused__)),
 	 Int c __attribute__((__unused__)))
 {
-#if defined(__weak_reference) && !defined(__FreeBSD__)
+#if defined(__weak_reference) && !defined(__FreeBSD__) && !defined(__DragonFly__)
 	char alias_name[3];
 	char *alias_text;
 




--- scripts/CMakeLists.txt.orig	2020-05-27 10:17:47 UTC
+++ scripts/CMakeLists.txt
@@ -336,6 +336,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var)
           GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE)
           STRING(REGEX REPLACE "^lib" "" lib "${lib}")
           SET(${var} "${${var}}-l${lib} " )

         ELSE()
           SET(${var} "${${var}}-l${lib} " )
         ENDIF()
@@ -421,14 +423,13 @@ ELSE()
   # On Unix, most of the files end up in the bin directory
   SET(mysql_config_COMPONENT COMPONENT Development)
 

       mysqldumpslow
       mysqld_multi
       mysqld_safe
@@ -472,7 +473,7 @@ ELSE()
   FOREACH(file ${BIN_SCRIPTS})
     IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh)
       CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh

Lines 1-4 Link Here

(-)files/patch-sql_CMakeLists.txt (-3 / +3 lines)
1	--- sql/CMakeLists.txt.orig 2019-10-21 05:21:41 UTC	1	--- sql/CMakeLists.txt.orig 2020-05-27 10:17:47 UTC
2	+++ sql/CMakeLists.txt	2	+++ sql/CMakeLists.txt
3	@@ -29,6 +29,8 @@ INCLUDE_DIRECTORIES(	3	@@ -29,6 +29,8 @@ INCLUDE_DIRECTORIES(
4	${CMAKE_SOURCE_DIR}/regex	4	${CMAKE_SOURCE_DIR}/regex
Lines 9-15 Link Here
9	${WSREP_INCLUDES}	9	${WSREP_INCLUDES}
10	${LZ4_INCLUDE_DIR}	10	${LZ4_INCLUDE_DIR}
11	)	11	)
12	@@ -647,6 +649,7 @@ ADD_CUSTOM_TARGET(	12	@@ -661,6 +663,7 @@ ADD_CUSTOM_TARGET(
13	)	13	)
14		14
15		15
Lines 17-23 Link Here
17	MYSQL_ADD_PLUGIN(udf_example udf_example.cc	17	MYSQL_ADD_PLUGIN(udf_example udf_example.cc
18	MODULE_ONLY TEST_ONLY MODULE_OUTPUT_NAME "udf_example")	18	MODULE_ONLY TEST_ONLY MODULE_OUTPUT_NAME "udf_example")
19	IF(NOT DISABLE_SHARED)	19	IF(NOT DISABLE_SHARED)
20	@@ -655,6 +658,7 @@ IF(NOT DISABLE_SHARED)	20	@@ -669,6 +672,7 @@ IF(NOT DISABLE_SHARED)
21	PROPERTIES LINK_FLAGS	21	PROPERTIES LINK_FLAGS
22	"/DEF:${CMAKE_CURRENT_SOURCE_DIR}/udf_example.def")	22	"/DEF:${CMAKE_CURRENT_SOURCE_DIR}/udf_example.def")
23	ENDIF()	23	ENDIF()

Lines 26-31 Link Here

(-)pkg-plist (+1 lines)
26	bin/wsrep_sst_xtrabackup	26	bin/wsrep_sst_xtrabackup
27	bin/wsrep_sst_xtrabackup-v2	27	bin/wsrep_sst_xtrabackup-v2
28	lib/mysql/plugin/adt_null.so	28	lib/mysql/plugin/adt_null.so
		29	lib/mysql/plugin/audit_log.so
29	lib/mysql/plugin/auth.so	30	lib/mysql/plugin/auth.so
30	lib/mysql/plugin/auth_pam.so	31	lib/mysql/plugin/auth_pam.so
31	lib/mysql/plugin/auth_test_plugin.so	32	lib/mysql/plugin/auth_test_plugin.so

Return to bug 247348

Lines 2-10 Link Here

(-)Makefile (-5 / +2 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= mysqlwsrep	4	PORTNAME= mysqlwsrep
5	PORTVERSION?= 5.7.28	5	PORTVERSION?= 5.7.30
6	DISTVERSIONPREFIX?= wsrep_	6	DISTVERSIONPREFIX?= wsrep_
7	DISTVERSIONSUFFIX?= -25.20	7	DISTVERSIONSUFFIX?= -25.22
8	PORTREVISION?= 0	8	PORTREVISION?= 0
9	CATEGORIES= databases	9	CATEGORIES= databases
10	MASTER_SITES+= SF/boost/boost/1.59.0:boost	10	MASTER_SITES+= SF/boost/boost/1.59.0:boost
Lines 17-24 Link Here
17	LICENSE= GPLv2	17	LICENSE= GPLv2
18		18
19	RUN_DEPENDS= bash:shells/bash \	19	RUN_DEPENDS= bash:shells/bash \
20	lsof:sysutils/lsof \
21	netcat:net/netcat \
22	rsync:net/rsync \	20	rsync:net/rsync \
23	socat:net/socat	21	socat:net/socat
24	LIB_DEPENDS= libevent.so:devel/libevent liblz4.so:archivers/liblz4	22	LIB_DEPENDS= libevent.so:devel/libevent liblz4.so:archivers/liblz4
Lines 61-67 Link Here
61	-DINSTALL_MYSQLDATADIR="${MY_DBDIR}" \	59	-DINSTALL_MYSQLDATADIR="${MY_DBDIR}" \
62	-DINSTALL_MYSQLKEYRINGDIR="etc/mysql/keyring" \	60	-DINSTALL_MYSQLKEYRINGDIR="etc/mysql/keyring" \
63	-DINSTALL_MYSQLSHAREDIR="share/mysql" \	61	-DINSTALL_MYSQLSHAREDIR="share/mysql" \
64	-DINSTALL_MYSQLTESTDIR="share/mysql/tests" \
65	-DINSTALL_PLUGINDIR="lib/mysql/plugin" \	62	-DINSTALL_PLUGINDIR="lib/mysql/plugin" \
66	-DINSTALL_SBINDIR="libexec" \	63	-DINSTALL_SBINDIR="libexec" \
67	-DINSTALL_SCRIPTDIR="bin" \	64	-DINSTALL_SCRIPTDIR="bin" \

Lines 1-6 Link Here

(-)files/patch-CMakeLists.txt (-5 / +5 lines)
1	--- CMakeLists.txt.orig 2019-10-21 05:21:41 UTC	1	--- CMakeLists.txt.orig 2020-05-27 10:17:47 UTC
2	+++ CMakeLists.txt	2	+++ CMakeLists.txt
3	@@ -730,12 +730,10 @@ IF(UNIX)	3	@@ -738,12 +738,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	@@ -744,8 +742,6 @@ ENDIF()	16	@@ -752,8 +750,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	@@ -804,6 +800,7 @@ ENDIF()	25	@@ -812,6 +808,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	31	INSTALL(FILES
32	README	32	README
33	@@ -825,6 +822,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")	33	@@ -833,6 +830,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	)

Lines 1-20 Link Here

(-)files/patch-cmd-line-utils_libedit_vi.c (-20 lines)
1	--- cmd-line-utils/libedit/vi.c.orig 2016-03-28 18:06:12 UTC
2	+++ cmd-line-utils/libedit/vi.c
3	@@ -919,7 +919,7 @@ vi_comment_out(EditLine *el, Int c __att
4	* NB: posix implies that we should enter insert mode, however
5	* this is against historical precedent...
6	*/
7	-#if defined(__weak_reference) && !defined(__FreeBSD__)
8	+#if defined(__weak_reference) && !defined(__FreeBSD__) && !defined(__DragonFly__)
9	__weakref_visible char my_get_alias_text(const char )
10	__weak_reference(get_alias_text);
11	#endif
12	@@ -928,7 +928,7 @@ protected el_action_t
13	vi_alias(EditLine *el __attribute__((__unused__)),
14	Int c __attribute__((__unused__)))
15	{
16	-#if defined(__weak_reference) && !defined(__FreeBSD__)
17	+#if defined(__weak_reference) && !defined(__FreeBSD__) && !defined(__DragonFly__)
18	char alias_name[3];
19	char *alias_text;
20

Lines 1-6 Link Here

(-)files/patch-scripts_CMakeLists.txt (-4 / +4 lines)
1	--- scripts/CMakeLists.txt.orig 2019-10-21 05:21:41 UTC	1	--- scripts/CMakeLists.txt.orig 2020-05-27 10:17:47 UTC
2	+++ scripts/CMakeLists.txt	2	+++ scripts/CMakeLists.txt
3	@@ -333,6 +333,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var)	3	@@ -336,6 +336,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} " )
Lines 9-15 Link Here
9	ELSE()	9	ELSE()
10	SET(${var} "${${var}}-l${lib} " )	10	SET(${var} "${${var}}-l${lib} " )
11	ENDIF()	11	ENDIF()
12	@@ -418,14 +420,13 @@ ELSE()	12	@@ -421,14 +423,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	@@ -469,7 +470,7 @@ ELSE()	28	@@ -472,7 +473,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