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

(-)databases/mysql56-client/Makefile (-3 / +7 lines)
Lines 2-11 Link Here
2
# $FreeBSD: head/databases/mysql56-client/Makefile 394288 2015-08-15 08:18:31Z ale $
2
# $FreeBSD: head/databases/mysql56-client/Makefile 394288 2015-08-15 08:18:31Z ale $
3
3
4
PORTNAME=	mysql
4
PORTNAME=	mysql
5
PORTREVISION?=	1
5
PKGNAMESUFFIX=	56-client
6
PKGNAMESUFFIX=	56-client
6
7
7
COMMENT=	Multithreaded SQL database (client)
8
COMMENT=	Multithreaded SQL database (client)
8
9
10
LICENSE+=	LGPL21
11
9
MASTERDIR=	${.CURDIR}/../mysql56-server
12
MASTERDIR=	${.CURDIR}/../mysql56-server
10
13
11
PKGMESSAGE=	${.CURDIR}/pkg-message
14
PKGMESSAGE=	${.CURDIR}/pkg-message
Lines 13-24 Link Here
13
PLIST=		${.CURDIR}/pkg-plist
16
PLIST=		${.CURDIR}/pkg-plist
14
17
15
CONFLICTS_INSTALL=	mysql5[0-57-9]-client-* \
18
CONFLICTS_INSTALL=	mysql5[0-57-9]-client-* \
16
			mariadb*-client-* \
19
			mysql[0-46-9][0-9]-client-* \
17
			percona*-client-*
20
			mariadb[0-9][0-9]-client-* \
21
			percona[0-9][0-9]-client-*
18
22
19
CMAKE_ARGS+=	-DWITHOUT_SERVER=1
23
CMAKE_ARGS+=	-DWITHOUT_SERVER=1
20
24
21
USE_LDCONFIG=	${PREFIX}/lib/mysql
25
USE_LDCONFIG+=	${PREFIX}/lib/mysql
22
26
23
MMAN1=		comp_err.1 msql2mysql.1 mysql.1 mysql_config.1 mysql_config_editor.1 mysql_find_rows.1 \
27
MMAN1=		comp_err.1 msql2mysql.1 mysql.1 mysql_config.1 mysql_config_editor.1 mysql_find_rows.1 \
24
		mysql_waitpid.1 mysqlaccess.1 mysqladmin.1 mysqlbinlog.1 \
28
		mysql_waitpid.1 mysqlaccess.1 mysqladmin.1 mysqlbinlog.1 \
(-)databases/mysql56-server/Makefile (-16 / +59 lines)
Lines 3-9 Link Here
3
3
4
PORTNAME?=	mysql
4
PORTNAME?=	mysql
5
PORTVERSION=	5.6.30
5
PORTVERSION=	5.6.30
6
PORTREVISION?=	0
6
PORTREVISION?=	1
7
CATEGORIES=	databases ipv6
7
CATEGORIES=	databases ipv6
8
MASTER_SITES=	MYSQL/MySQL-5.6
8
MASTER_SITES=	MYSQL/MySQL-5.6
9
PKGNAMESUFFIX?=	56-server
9
PKGNAMESUFFIX?=	56-server
Lines 14-38 Link Here
14
BROKEN_powerpc64=	Does not build
14
BROKEN_powerpc64=	Does not build
15
15
16
SLAVEDIRS=	databases/mysql56-client
16
SLAVEDIRS=	databases/mysql56-client
17
USES=		cmake shebangfix
17
USES=		bison:build cmake compiler:c11 compiler:c++11-lib cpe libedit localbase perl5 shebangfix
18
18
19
CMAKE_ARGS+=	-DINSTALL_DOCDIR="share/doc/mysql" \
19
USE_OPENSSL=	yes
20
USE_PERL5=	run
21
22
MY_DBDIR=	/var/db/mysql
23
MY_SECDIR=	/var/db/mysql_secure
24
MY_TMPDIR=	/var/db/mysql_tmpdir
25
26
LIB_DEPENDS+=	libevent.so:devel/libevent2
27
28
CMAKE_BUILD_TYPE=	Release
29
30
CMAKE_ARGS+=	-DINSTALL_LAYOUT=STANDALONE \
31
		-DINSTALL_LDCONFIGDIR="${LOCALBASE}/libdata/ldconfig" \
32
		-DINSTALL_PKGCONFIGDIR="${LOCALBASE}/libdata/pkgconfig" \
33
		-DINSTALL_DOCDIR="share/doc/mysql" \
20
		-DINSTALL_DOCREADMEDIR="share/doc/mysql" \
34
		-DINSTALL_DOCREADMEDIR="share/doc/mysql" \
21
		-DINSTALL_INCLUDEDIR="include/mysql" \
35
		-DINSTALL_INCLUDEDIR="include/mysql" \
22
		-DINSTALL_INFODIR="info" \
36
		-DINSTALL_INFODIR="info" \
23
		-DINSTALL_LIBDIR="lib/mysql" \
37
		-DINSTALL_LIBDIR="lib/mysql" \
24
		-DINSTALL_MANDIR="man" \
38
		-DINSTALL_MANDIR="man" \
25
		-DINSTALL_MYSQLDATADIR="/var/db/mysql" \
39
		-DINSTALL_MYSQLDATADIR="${MY_DBDIR}" \
26
		-DINSTALL_MYSQLSHAREDIR="share/mysql" \
40
		-DINSTALL_MYSQLSHAREDIR="share/mysql" \
27
		-DINSTALL_MYSQLTESTDIR="share/mysql/tests" \
41
		-DINSTALL_MYSQLTESTDIR="share/mysql/tests" \
28
		-DINSTALL_PLUGINDIR="lib/mysql/plugin" \
42
		-DINSTALL_PLUGINDIR="lib/mysql/plugin" \
29
		-DINSTALL_SBINDIR="libexec" \
43
		-DINSTALL_SBINDIR="libexec" \
30
		-DINSTALL_SCRIPTDIR="bin" \
44
		-DINSTALL_SCRIPTDIR="bin" \
45
		-DINSTALL_SECURE_FILE_PRIVDIR="${MY_SECDIR}" \
31
		-DINSTALL_SHAREDIR="share" \
46
		-DINSTALL_SHAREDIR="share" \
32
		-DINSTALL_SQLBENCHDIR="share/mysql" \
47
		-DINSTALL_SQLBENCHDIR="share/mysql" \
33
		-DINSTALL_SUPPORTFILESDIR="share/mysql" \
48
		-DINSTALL_SUPPORTFILESDIR="share/mysql" \
34
		-DWITH_EDITLINE=system \
49
		-DWITH_EDITLINE=system \
35
		-DWITH_LIBWRAP=1
50
		-DWITH_LIBEVENT=system \
51
		-DWITH_ZLIB=system
52
53
DATADIR=	${PREFIX}/share/mysql
36
54
37
SHEBANG_FILES=	scripts/*.pl* scripts/*.sh
55
SHEBANG_FILES=	scripts/*.pl* scripts/*.sh
38
56
Lines 40-56 Link Here
40
.error You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again.
58
.error You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again.
41
.endif
59
.endif
42
60
61
SUB_LIST=	MY_DBDIR=${MY_DBDIR} \
62
		MY_SECDIR=${MY_SECDIR} \
63
		MY_TMPDIR=${MY_TMPDIR}
64
65
PLIST_SUB=	MY_DBDIR=${MY_DBDIR} \
66
		MY_SECDIR=${MY_SECDIR} \
67
		MY_TMPDIR=${MY_TMPDIR}
68
43
# MySQL-Server part
69
# MySQL-Server part
44
.if !defined(CLIENT_ONLY)
70
.if !defined(CLIENT_ONLY)
45
USE_MYSQL=	yes
71
USES+=		mysql:56
46
WANT_MYSQL_VER=	56
47
72
48
USES+=		perl5
73
USE_LDCONFIG+=	${PREFIX}/lib/mysql/plugin
49
USE_PERL5=	run
50
74
51
CONFLICTS_INSTALL=	mysql5[0-57-9]-server-* \
75
CONFLICTS_INSTALL=	mysql5[0-57-9]-server-* \
52
			mariadb*-server-* \
76
			mysql[0-46-9][0-9]-server-* \
53
			percona*-server-*
77
			mariadb[0-9][0-9]-server-* \
78
			percona[0-9][0-9]-server-*
54
79
55
USE_RC_SUBR=	mysql-server
80
USE_RC_SUBR=	mysql-server
56
81
Lines 65-81 Link Here
65
		mysqltest.1 perror.1 replace.1 resolve_stack_dump.1 resolveip.1
90
		mysqltest.1 perror.1 replace.1 resolve_stack_dump.1 resolveip.1
66
91
67
CMAKE_ARGS+=	-DWITH_EMBEDDED_SERVER="ON"
92
CMAKE_ARGS+=	-DWITH_EMBEDDED_SERVER="ON"
68
.else
69
USES+=		libedit
70
.endif
93
.endif
71
94
72
post-patch:
73
	@${REINPLACE_CMD} 's/*.1/${MMAN1}/' ${WRKSRC}/man/CMakeLists.txt
74
75
.include <bsd.port.pre.mk>
95
.include <bsd.port.pre.mk>
76
96
77
.if ${ARCH} == "armv6"
97
.if ${ARCH} == "armv6"
78
EXTRA_PATCHES+=		${FILESDIR}/extra-patch-config.h.cmake
98
EXTRA_PATCHES+=		${FILESDIR}/extra-patch-config.h.cmake
79
.endif
99
.endif
80
100
101
### Just for the sake of FreeBSD 9.X ###
102
.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000
103
WITH_OPENSSL_PORT=	yes
104
105
### FreeBSD Version > 9.X ###
106
.else
107
.if defined(WITH_OPENSSL_BASE)
108
CMAKE_ARGS+=		-DWITH_SSL=system
109
.else
110
CMAKE_ARGS+=		-DWITH_SSL=${OPENSSLBASE}
111
.endif
112
.endif
113
114
post-patch:
115
	@${REINPLACE_CMD} 's/*.1/${MMAN1}/' ${WRKSRC}/man/CMakeLists.txt
116
117
.if !defined(CLIENT_ONLY)
118
post-stage:
119
	${MKDIR} ${STAGEDIR}${MY_DBDIR}
120
	${MKDIR} ${STAGEDIR}${MY_SECDIR}
121
	${MKDIR} ${STAGEDIR}${MY_TMPDIR}
122
.endif
123
81
.include <bsd.port.post.mk>
124
.include <bsd.port.post.mk>
(-)databases/mysql56-server/pkg-plist (+3 lines)
Lines 129-131 Link Here
129
%%DATADIR%%/spanish/errmsg.sys
129
%%DATADIR%%/spanish/errmsg.sys
130
%%DATADIR%%/swedish/errmsg.sys
130
%%DATADIR%%/swedish/errmsg.sys
131
%%DATADIR%%/ukrainian/errmsg.sys
131
%%DATADIR%%/ukrainian/errmsg.sys
132
@dir(mysql,mysql,0755) %%MY_DBDIR%%
133
@dir(mysql,mysql,0750) %%MY_SECDIR%%
134
@dir(mysql,mysql,0750) %%MY_TMPDIR%%
(-)databases/mysql57-client/Makefile (-2 lines)
Lines 9-16 Link Here
9
9
10
LICENSE+=	LGPL21
10
LICENSE+=	LGPL21
11
11
12
BROKEN_powerpc64=	Does not build
13
14
MASTERDIR=	${.CURDIR}/../mysql57-server
12
MASTERDIR=	${.CURDIR}/../mysql57-server
15
13
16
PKGMESSAGE=	${.CURDIR}/pkg-message
14
PKGMESSAGE=	${.CURDIR}/pkg-message
(-)databases/mysql57-server/Makefile (-3 / +6 lines)
Lines 17-23 Link Here
17
WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
17
WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
18
18
19
SLAVEDIRS=	databases/mysql57-client
19
SLAVEDIRS=	databases/mysql57-client
20
USES=		bison:build cmake:outsource compiler:c11 compiler:c++11-lib cpe libedit localbase perl5 shebangfix
20
USES=		bison:build cmake compiler:c11 compiler:c++11-lib cpe libedit localbase perl5 shebangfix
21
21
22
USE_OPENSSL=	yes
22
USE_OPENSSL=	yes
23
USE_PERL5=	run
23
USE_PERL5=	run
Lines 58-63 Link Here
58
		-DWITH_LZ4=system \
58
		-DWITH_LZ4=system \
59
		-DWITH_ZLIB=system
59
		-DWITH_ZLIB=system
60
60
61
DATADIR=	${PREFIX}/share/mysql
62
61
SHEBANG_FILES=	scripts/*.pl* scripts/*.sh
63
SHEBANG_FILES=	scripts/*.pl* scripts/*.sh
62
64
63
.ifdef USE_MYSQL
65
.ifdef USE_MYSQL
Lines 76-81 Link Here
76
.if !defined(CLIENT_ONLY)
78
.if !defined(CLIENT_ONLY)
77
USES+=		mysql:57
79
USES+=		mysql:57
78
80
81
USE_LDCONFIG+=	${PREFIX}/lib/mysql/plugin
82
79
CONFLICTS_INSTALL=	mysql5[0-68-9]-server-* \
83
CONFLICTS_INSTALL=	mysql5[0-68-9]-server-* \
80
			mysql[0-46-9][0-9]-server-* \
84
			mysql[0-46-9][0-9]-server-* \
81
			mariadb[0-9][0-9]-server-* \
85
			mariadb[0-9][0-9]-server-* \
Lines 88-95 Link Here
88
USERS=		mysql
92
USERS=		mysql
89
GROUPS=		mysql
93
GROUPS=		mysql
90
94
91
USE_LDCONFIG+=	${PREFIX}/lib/mysql/plugin
92
93
MMAN1=		my_print_defaults.1 myisam_ftdump.1 myisamchk.1 myisamlog.1 myisampack.1 \
95
MMAN1=		my_print_defaults.1 myisam_ftdump.1 myisamchk.1 myisamlog.1 myisampack.1 \
94
		mysql.server.1 mysql_convert_table_format.1 mysql_fix_extensions.1 \
96
		mysql.server.1 mysql_convert_table_format.1 mysql_fix_extensions.1 \
95
		mysql_install_db.1 mysql_plugin.1 mysql_secure_installation.1 mysql_setpermission.1 \
97
		mysql_install_db.1 mysql_plugin.1 mysql_secure_installation.1 mysql_setpermission.1 \
Lines 160-165 Link Here
160
162
161
post-stage:
163
post-stage:
162
	${MKDIR} ${STAGEDIR}${ETCDIR}/keyring
164
	${MKDIR} ${STAGEDIR}${ETCDIR}/keyring
165
	${MKDIR} ${STAGEDIR}${MY_DBDIR}
163
	${MKDIR} ${STAGEDIR}${MY_SECDIR}
166
	${MKDIR} ${STAGEDIR}${MY_SECDIR}
164
	${MKDIR} ${STAGEDIR}${MY_TMPDIR}
167
	${MKDIR} ${STAGEDIR}${MY_TMPDIR}
165
.endif
168
.endif
(-)databases/mysql57-server/pkg-plist (+1 lines)
Lines 155-159 Link Here
155
%%DATADIR%%/uninstall_rewriter.sql
155
%%DATADIR%%/uninstall_rewriter.sql
156
@sample(root,wheel,0644) %%ETCDIR%%/my.cnf.sample
156
@sample(root,wheel,0644) %%ETCDIR%%/my.cnf.sample
157
@dir(mysql,mysql,0750) %%ETCDIR%%/keyring
157
@dir(mysql,mysql,0750) %%ETCDIR%%/keyring
158
@dir(mysql,mysql,0755) %%MY_DBDIR%%
158
@dir(mysql,mysql,0750) %%MY_SECDIR%%
159
@dir(mysql,mysql,0750) %%MY_SECDIR%%
159
@dir(mysql,mysql,0750) %%MY_TMPDIR%%
160
@dir(mysql,mysql,0750) %%MY_TMPDIR%%

Return to bug 209618