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

Collapse All | Expand All

(-)Makefile (-74 / +50 lines)
Lines 1-7 Link Here
1
# $FreeBSD: head/databases/mariadb55-server/Makefile 373396 2014-11-25 09:57:29Z marino $
1
# $FreeBSD: head/databases/mariadb55-server/Makefile 373396 2014-11-25 09:57:29Z marino $
2
2
3
PORTNAME?=	mariadb
3
PORTNAME?=	mariadb
4
PORTVERSION=	5.5.40
4
PORTVERSION=	5.5.41
5
CATEGORIES=	databases ipv6
5
CATEGORIES=	databases ipv6
6
MASTER_SITES=	http://ftp.osuosl.org/pub/mariadb/${PORTNAME}-${PORTVERSION}/source/ \
6
MASTER_SITES=	http://ftp.osuosl.org/pub/mariadb/${PORTNAME}-${PORTVERSION}/source/ \
7
		http://mirrors.supportex.net/mariadb/${PORTNAME}-${PORTVERSION}/source/ \
7
		http://mirrors.supportex.net/mariadb/${PORTNAME}-${PORTVERSION}/source/ \
Lines 23-36 Link Here
23
SLAVEDIRS=	databases/mariadb55-client
23
SLAVEDIRS=	databases/mariadb55-client
24
USES=		cmake execinfo gmake shebangfix
24
USES=		cmake execinfo gmake shebangfix
25
SHEBANG_FILES=	scripts/*.sh
25
SHEBANG_FILES=	scripts/*.sh
26
NO_OPTIONS_SORT=yes
27
28
OPTIONS_DEFINE+=	SSL OPENSSL PORTSSL FASTMTX
29
OPTIONS_DEFAULT+=	SSL
30
31
FASTMTX_DESC=	Replace mutexes with spinlocks
32
OPENSSL_DESC=	Use OpenSSL instead of bundled yassl
33
PORTSSL_DESC=	Use OpenSSL from port (requires OPENSSL to be set)
34
26
35
CMAKE_ARGS+=	-DINSTALL_DOCDIR="share/doc/mysql" \
27
CMAKE_ARGS+=	-DINSTALL_DOCDIR="share/doc/mysql" \
36
		-DINSTALL_DOCREADMEDIR="share/doc/mysql" \
28
		-DINSTALL_DOCREADMEDIR="share/doc/mysql" \
Lines 53-108 Link Here
53
		-DEXECINFO_ROOT=${LOCALBASE} \
45
		-DEXECINFO_ROOT=${LOCALBASE} \
54
		-DCOMPILATION_COMMENT="FreeBSD Ports"
46
		-DCOMPILATION_COMMENT="FreeBSD Ports"
55
47
56
.ifdef USE_MYSQL
57
.error You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again.
58
.endif
59
60
DATADIR=	${PREFIX}/share/mysql
48
DATADIR=	${PREFIX}/share/mysql
61
49
62
# MySQL-Server options
50
BROKEN_armv6=		Does not compile on arm
63
.if !defined(CLIENT_ONLY)
64
OPTIONS_DEFINE+=	OQGRAPH MAXKEY
65
66
OQGRAPH_DESC=	Open Query Graph Computation engine
67
MAXKEY_DESC=	Change max key length from 1000 to 4000
68
69
OPTIONS_DEFAULT+=	MAXKEY
70
.endif
71
72
.include <bsd.port.options.mk>
73
51
74
.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000012
52
.if defined(USE_MYSQL)
75
CMAKE_ARGS+=	-DWITH_JEMALLOC="system"
53
.error You have 'USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again.
76
.else
77
CMAKE_ARGS+=	-DWITH_JEMALLOC="no"
78
.endif
54
.endif
79
55
80
.if ${PORT_OPTIONS:MSSL}
81
.if exists(${LOCALBASE}/include/openssl/opensslv.h)
82
.  if !${PORT_OPTIONS:MOPENSSL} || !${PORT_OPTIONS:MPORTSSL}
83
IGNORE=	security/openssl package is installed. To build this either select the OPENSSL and PORTSSL options or deinstall openssl
84
.  endif
85
.endif
86
.if ${PORT_OPTIONS:MOPENSSL}
87
USE_OPENSSL=	yes
88
.if !${PORT_OPTIONS:MPORTSSL}
89
WITH_OPENSSL_BASE=	yes
90
.else
91
WITH_OPENSSL_PORT=	yes
92
.endif
93
CMAKE_ARGS+=	-DWITH_SSL=yes
94
.else
95
CMAKE_ARGS+=	-DWITH_SSL=bundled
96
.endif
97
.else
98
CMAKE_FLAGS+=	-DWITH_SSL=no
99
.endif
100
.if ${PORT_OPTIONS:MFASTMTX}
101
CMAKE_ARGS+=	-DWITH_FAST_MUTEXES=1
102
.endif
103
104
# MySQL-Server part
105
.if !defined(CLIENT_ONLY)
56
.if !defined(CLIENT_ONLY)
57
# MySQL-Server part
106
USE_MYSQL=	yes
58
USE_MYSQL=	yes
107
WANT_MYSQL_VER=	55m
59
WANT_MYSQL_VER=	55m
108
60
Lines 119-143 Link Here
119
CMAKE_ARGS+=	-DWITH_EMBEDDED_SERVER="ON" \
71
CMAKE_ARGS+=	-DWITH_EMBEDDED_SERVER="ON" \
120
		-DWITHOUT_EXAMPLE_STORAGE_ENGINE=1
72
		-DWITHOUT_EXAMPLE_STORAGE_ENGINE=1
121
73
122
post-install:
123
.if !defined(PACKAGE_BUILDING)
124
	@${CAT} ${PKGMESSAGE}
125
.endif
126
127
.if empty(PORT_OPTIONS:MOQGRAPH)
128
CMAKE_ARGS+=	-DWITHOUT_OQGRAPH_STORAGE_ENGINE=1
129
PLIST_SUB+=	OQGRAPH="@comment "
130
.else
74
.else
131
USE_GCC?=	yes
75
# MySQL-Client part
132
CMAKE_ARGS+=	-DWITH_OQGRAPH_STORAGE_ENGINE=1
76
USES+=		readline
133
PLIST_SUB+=	OQGRAPH=""
134
LIB_DEPENDS+=	libboost_system.so:${PORTSDIR}/devel/boost-libs
135
.endif
77
.endif
136
.if ${PORT_OPTIONS:MMAXKEY}
78
137
EXTRA_PATCHES+=	${FILESDIR}/extra-patch-include_my_compare.h
79
OPTIONS_DEFINE+=	FASTMTX
80
OPTIONS_RADIO=		SSL
81
OPTIONS_RADIO_SSL=	BUNDLED_SSL OPENSSL WITHOUT_SSL
82
OPTIONS_DEFAULT+=	OPENSSL
83
OPTIONS_SUB=		yes
84
NO_OPTIONS_SORT=yes
85
86
BUNDLED_SSL_DESC=	SSL/TLS support via (bundled) CyaSSL
87
FASTMTX_DESC=	Replace mutexes with spinlocks
88
WITHOUT_SSL_DESC=	No SSL/TLS support
89
OPENSSL_CMAKE_ON=	-DWITH_SSL=yes
90
OPENSSL_USE=		USE_OPENSSL=yes
91
BUNDLED_SSL_CMAKE_ON=	-DWITH_SSL=bundled
92
WITHOUT_SSL_CMAKE_ON=	-DWITH_SSL=no
93
94
FASTMTX_CMAKE_ON=	-DWITH_FAST_MUTEXES=1
95
96
.if !defined(CLIENT_ONLY)
97
# MySQL-Server options
98
OPTIONS_DEFINE+=	MAXKEY OQGRAPH
99
OPTIONS_DEFAULT+=	MAXKEY
100
101
MAXKEY_DESC=	Change max key length from 1000 to 4000
102
OQGRAPH_DESC=	Open Query Graph Computation engine
103
104
OQGRAPH_CMAKE_OFF=	-DWITHOUT_OQGRAPH_STORAGE_ENGINE=1
105
OQGRAPH_USE=	GCC=yes
106
OQGRAPH_CMAKE_ON=	-DWITH_OQGRAPH_STORAGE_ENGINE=1
107
OQGRAPH_LIB_DEPENDS=	libboost_system.so:${PORTSDIR}/devel/boost-libs
108
109
MAXKEY_EXTRA_PATCHES=	${FILESDIR}/extra-patch-include_my_compare.h
138
.endif
110
.endif
111
112
.include <bsd.port.pre.mk>
113
114
.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000012
115
CMAKE_ARGS+=	-DWITH_JEMALLOC="system"
139
.else
116
.else
140
USES+=		readline
117
CMAKE_ARGS+=	-DWITH_JEMALLOC="no"
118
.endif
119
120
# Server segfaults on i386 when built with clang >= 3.4
121
.if ${ARCH} == 'i386' && ${OSVERSION} >= 1001000
122
USE_GCC=        yes
141
.endif
123
.endif
142
124
143
post-patch:
125
post-patch:
Lines 145-154 Link Here
145
	@${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/mysys/default.c
127
	@${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/mysys/default.c
146
	@${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/scripts/mysql_config.sh
128
	@${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/scripts/mysql_config.sh
147
129
148
.include <bsd.port.pre.mk>
149
150
.if ${ARCH} == "arm"
151
BROKEN=		Does not compile on arm
152
.endif
153
154
.include <bsd.port.post.mk>
130
.include <bsd.port.post.mk>
(-)distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (mariadb-5.5.40.tar.gz) = cbde17f4a31483143490def6fcce33310ebae49eafe92dc4ada0e7227202415a
1
SHA256 (mariadb-5.5.41.tar.gz) = a16dc62e4bcabecd5c483f2f8b657483a8c51934e7be5ad4ab21b8baea1f5332
2
SIZE (mariadb-5.5.40.tar.gz) = 44745240
2
SIZE (mariadb-5.5.41.tar.gz) = 45526003

Return to bug 196125