Page MenuHomeFreeBSD
Files F172882274

D6161.id15831.diff
No OneTemporary
Actions

D6161.id15831.diff
View Options

Index: head/databases/mariadb55-server/Makefile
===================================================================
--- head/databases/mariadb55-server/Makefile
+++ head/databases/mariadb55-server/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME?= mariadb
-PORTVERSION= 5.5.47
+PORTVERSION= 5.5.49
CATEGORIES= databases ipv6
MASTER_SITES= http://ftp.osuosl.org/pub/mariadb/${PORTNAME}-${PORTVERSION}/source/ \
http://mirrors.supportex.net/mariadb/${PORTNAME}-${PORTVERSION}/source/ \
@@ -26,6 +26,7 @@
SLAVEDIRS= databases/mariadb55-client
USES= cmake execinfo gmake shebangfix
+USE_OPENSSL= yes
SHEBANG_FILES= scripts/*.sh
CMAKE_ARGS+= -DINSTALL_DOCDIR="share/doc/mysql" \
@@ -46,6 +47,7 @@
-DWITH_UNIT_TESTS=0 \
-DWITH_LIBEDIT=0 \
-DWITH_LIBWRAP=1 \
+ -DWITH_SSL=yes \
-DEXECINFO_ROOT=${LOCALBASE} \
-DCOMPILATION_COMMENT="FreeBSD Ports"
@@ -59,8 +61,7 @@
.if !defined(CLIENT_ONLY)
# MySQL-Server part
-USE_MYSQL= yes
-WANT_MYSQL_VER= 55m
+USES+= mysql:55m
CONFLICTS_INSTALL= mariadb5[0-46-9]-server-* \
mariadb1*-server-* \
@@ -72,7 +73,8 @@
USERS= mysql
GROUPS= mysql
-CMAKE_ARGS+= -DWITH_EMBEDDED_SERVER="ON" \
+CMAKE_ARGS+= -DREADLINE_INCLUDE_DIR=/usr/include \
+ -DWITH_EMBEDDED_SERVER="ON" \
-DWITHOUT_EXAMPLE_STORAGE_ENGINE=1
.else
@@ -81,19 +83,10 @@
.endif
OPTIONS_DEFINE+= FASTMTX
-OPTIONS_RADIO= SSL
-OPTIONS_RADIO_SSL= BUNDLED_SSL OPENSSL WITHOUT_SSL
-OPTIONS_DEFAULT+= OPENSSL
OPTIONS_SUB= yes
NO_OPTIONS_SORT=yes
-BUNDLED_SSL_DESC= SSL/TLS support via (bundled) CyaSSL
FASTMTX_DESC= Replace mutexes with spinlocks
-WITHOUT_SSL_DESC= No SSL/TLS support
-OPENSSL_CMAKE_ON= -DWITH_SSL=yes
-OPENSSL_USE= USE_OPENSSL=yes
-BUNDLED_SSL_CMAKE_ON= -DWITH_SSL=bundled
-WITHOUT_SSL_CMAKE_ON= -DWITH_SSL=no
FASTMTX_CMAKE_ON= -DWITH_FAST_MUTEXES=1
Index: head/databases/mariadb55-server/distinfo
===================================================================
--- head/databases/mariadb55-server/distinfo
+++ head/databases/mariadb55-server/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mariadb-5.5.47.tar.gz) = 62b9378677433461d2a79b1ebe3182ba249994eb0cff2054ae8de8f646364209
-SIZE (mariadb-5.5.47.tar.gz) = 45705343
+SHA256 (mariadb-5.5.49.tar.gz) = 2c82f2af71b88a7940d5ff647498ed78922c92e88004942caa213131e20f4706
+SIZE (mariadb-5.5.49.tar.gz) = 45738390

File Metadata

Mime Type
text/plain
Expires
Tue, Sep 22, 7:57 PM (11 h, 21 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
39433063
Default Alt Text
D6161.id15831.diff (2 KB)

Event Timeline