View | Details | Raw Unified | Return to bug 206998 | Differences between
and this patch

Collapse All | Expand All

(-)mysql57-server/Makefile (-10 / +32 lines)
Lines 17-35 Link Here
17
SLAVEDIRS=	databases/mysql57-client
17
SLAVEDIRS=	databases/mysql57-client
18
USES=		cmake:outsource shebangfix
18
USES=		cmake:outsource shebangfix
19
19
20
OPTIONS_RADIO=		SSL ZLIB
20
OPTIONS_RADIO=      SSL LIBEDIT LIBEVENT LZ4 ZLIB
21
OPTIONS_RADIO_SSL=	BUNDLED_SSL OPENSSL WITHOUT_SSL
21
OPTIONS_RADIO_SSL=  BUNDLED_SSL OPENSSL WITHOUT_SSL
22
OPTIONS_DEFAULT+=	OPENSSL BUNDLED_ZLIB
22
OPTIONS_RADIO_LIBEDIT=  BUNDLED_LIBEDIT SYSTEM_LIBEDIT
23
OPTIONS_RADIO_ZLIB=	BUNDLED_ZLIB SYSTEM_ZLIB
23
OPTIONS_RADIO_LIBEVENT=  BUNDLED_LIBEVENT SYSTEM_LIBEVENT
24
OPTIONS_RADIO_LZ4=  BUNDLED_LZ4 SYSTEM_LZ4
25
OPTIONS_RADIO_ZLIB= BUNDLED_ZLIB SYSTEM_ZLIB
26
OPTIONS_DEFAULT+=   OPENSSL BUNDLED_LIBEDIT BUNDLED_LIBEVENT BUNDLED_LZ4 BUNDLED_ZLIB
24
27
25
NO_OPTIONS_SORT=	yes
28
NO_OPTIONS_SORT=	yes
26
29
27
BUNDLED_SSL_DESC=	SSL/TLS support via (bundled) CyaSSL
30
BUNDLED_SSL_DESC=	SSL/TLS support via (bundled) CyaSSL
28
WITHOUT_SSL_DESC=	No SSL/TLS support
31
WITHOUT_SSL_DESC=	No SSL/TLS support
32
BUNDLED_LIBEDIT_DESC=	Use bundled libedit
33
SYSTEM_LIBEDIT_DESC=	Use system libedit
34
BUNDLED_LIBEVENT_DESC=	Use bundled libevent
35
SYSTEM_LIBEVENT_DESC=	Use system libevent
36
BUNDLED_LZ4_DESC=	Use bundled lz4 lib
37
SYSTEM_LZ4_DESC=	Use system lz4 lib
29
BUNDLED_ZLIB_DESC=	Use bundled zlib
38
BUNDLED_ZLIB_DESC=	Use bundled zlib
30
SYSTEM_ZLIB_DESC=	Use system zlib
39
SYSTEM_ZLIB_DESC=	Use system zlib
31
40
32
CMAKE_ARGS+=	-DINSTALL_LAYOUT=STANDALONE \
41
CMAKE_ARGS+=	-DCMAKE_BUILD_TYPE=RELEASE \
42
		-DINSTALL_LAYOUT=STANDALONE \
33
		-DINSTALL_DOCDIR="share/doc/mysql" \
43
		-DINSTALL_DOCDIR="share/doc/mysql" \
34
		-DINSTALL_DOCREADMEDIR="share/doc/mysql" \
44
		-DINSTALL_DOCREADMEDIR="share/doc/mysql" \
35
		-DINSTALL_INCLUDEDIR="include/mysql" \
45
		-DINSTALL_INCLUDEDIR="include/mysql" \
Lines 38-43 Link Here
38
		-DINSTALL_PKGCONFIGDIR=${PREFIX}/libdata/pkgconfig \
48
		-DINSTALL_PKGCONFIGDIR=${PREFIX}/libdata/pkgconfig \
39
		-DINSTALL_MANDIR="man" \
49
		-DINSTALL_MANDIR="man" \
40
		-DINSTALL_MYSQLDATADIR="/var/db/mysql" \
50
		-DINSTALL_MYSQLDATADIR="/var/db/mysql" \
51
		-DINSTALL_MYSQLKEYRINGDIR="etc/mysql/keyring" \
41
		-DINSTALL_MYSQLSHAREDIR="share/mysql" \
52
		-DINSTALL_MYSQLSHAREDIR="share/mysql" \
42
		-DINSTALL_MYSQLTESTDIR="share/mysql/tests" \
53
		-DINSTALL_MYSQLTESTDIR="share/mysql/tests" \
43
		-DINSTALL_PLUGINDIR="lib/mysql/plugin" \
54
		-DINSTALL_PLUGINDIR="lib/mysql/plugin" \
Lines 45-53 Link Here
45
		-DINSTALL_SCRIPTDIR="bin" \
56
		-DINSTALL_SCRIPTDIR="bin" \
46
		-DINSTALL_SHAREDIR="share" \
57
		-DINSTALL_SHAREDIR="share" \
47
		-DINSTALL_SUPPORTFILESDIR="share/mysql" \
58
		-DINSTALL_SUPPORTFILESDIR="share/mysql" \
48
		-DWITH_INNODB_EXTRA_DEBUG=0 \
59
		-DMYSQL_DATADIR="/var/db/mysql" \
60
		-DMYSQL_KEYRINGDIR=${PREFIX}/etc/mysql/keyring \
61
		-DSYSCONFDIR=${PREFIX}/etc/mysql \
49
		-DWITH_BOOST=${WRKSRC}/boost \
62
		-DWITH_BOOST=${WRKSRC}/boost \
50
		-DWITH_LIBEVENT=system
63
		-DWITH_PIC=1 \
64
		-DWITH_UNIT_TEST=0
51
65
52
SHEBANG_FILES=	scripts/*.pl* scripts/*.sh
66
SHEBANG_FILES=	scripts/*.pl* scripts/*.sh
53
67
Lines 59-64 Link Here
59
OPENSSL_USE=		OPENSSL=yes
73
OPENSSL_USE=		OPENSSL=yes
60
WITHOUT_SSL_CMAKE_ON=	-DWITH_SSL=no
74
WITHOUT_SSL_CMAKE_ON=	-DWITH_SSL=no
61
75
76
BUNDLED_LIBEDIT_CMAKE_ON=	-DWITH_LIBEDIT=bundled
77
SYSTEM_LIBEDIT_CMAKE_ON=	-DWITH_LIBEDIT=system
78
79
BUNDLED_LIBEVENT_CMAKE_ON=	-DWITH_LIBEVENT=bundled
80
SYSTEM_LIBEVENT_CMAKE_ON=	-DWITH_LIBEVENT=system
81
82
BUNDLED_LZ4_CMAKE_ON=	-DWITH_LZ4=bundled
83
SYSTEM_LZ4_CMAKE_ON=	-DWITH_LZ4=system
84
62
BUNDLED_ZLIB_CMAKE_ON=	-DWITH_ZLIB=bundled
85
BUNDLED_ZLIB_CMAKE_ON=	-DWITH_ZLIB=bundled
63
SYSTEM_ZLIB_CMAKE_ON=	-DWITH_ZLIB=system
86
SYSTEM_ZLIB_CMAKE_ON=	-DWITH_ZLIB=system
64
87
Lines 67-73 Link Here
67
USE_MYSQL=	yes
90
USE_MYSQL=	yes
68
WANT_MYSQL_VER=	57
91
WANT_MYSQL_VER=	57
69
92
70
USES+=		bison:build cpe perl5
93
USES+=		bison:build cpe libedit perl5
71
USE_PERL5=	run
94
USE_PERL5=	run
72
95
73
CONFLICTS_INSTALL=	mariadb[0-9]*-server-* \
96
CONFLICTS_INSTALL=	mariadb[0-9]*-server-* \
Lines 84-90 Link Here
84
MMAN1=		my_print_defaults.1 myisam_ftdump.1 myisamchk.1 myisamlog.1 myisampack.1 \
107
MMAN1=		my_print_defaults.1 myisam_ftdump.1 myisamchk.1 myisamlog.1 myisampack.1 \
85
		mysql.server.1 mysql_convert_table_format.1 mysql_fix_extensions.1 \
108
		mysql.server.1 mysql_convert_table_format.1 mysql_fix_extensions.1 \
86
		mysql_install_db.1 mysql_plugin.1 mysql_secure_installation.1 mysql_setpermission.1 \
109
		mysql_install_db.1 mysql_plugin.1 mysql_secure_installation.1 mysql_setpermission.1 \
87
 		mysql_tzinfo_to_sql.1 mysql_upgrade.1 mysql_zap.1 mysqlbug.1 \
110
		mysql_tzinfo_to_sql.1 mysql_upgrade.1 mysql_zap.1 mysqlbug.1 \
88
		mysqld_multi.1 mysqld_safe.1 mysqldumpslow.1 mysqlhotcopy.1 mysqlman.1 \
111
		mysqld_multi.1 mysqld_safe.1 mysqldumpslow.1 mysqlhotcopy.1 mysqlman.1 \
89
		mysqltest.1 perror.1 replace.1 resolve_stack_dump.1 resolveip.1
112
		mysqltest.1 perror.1 replace.1 resolve_stack_dump.1 resolveip.1
90
113
Lines 121-127 Link Here
121
144
122
.else
145
.else
123
USES+=		libedit
146
USES+=		libedit
124
CMAKE_ARGS+=	-DWITH_EDITLINE=system
125
.endif
147
.endif
126
148
127
.include <bsd.port.pre.mk>
149
.include <bsd.port.pre.mk>

Return to bug 206998