Date: Sat, 16 Mar 2013 01:39:47 +0200 (EET)
From: Alexandr Kovalenko <never@nevermind.kiev.ua>
To: FreeBSD-gnats-submit@freebsd.org
Subject: ports/177009: [MAINTAINER] Update databases/mariadb55-{client, server} to 5.5.30
Message-ID: <201303152339.r2FNdlxe063900@naia.nevermind.kiev.ua>
Resent-Message-ID: <201303152350.r2FNo0K2059400@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 177009
>Category: ports
>Synopsis: [MAINTAINER] Update databases/mariadb55-{client,server} to 5.5.30
>Confidential: no
>Severity: serious
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Fri Mar 15 23:50:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: Alexandr Kovalenko
>Release: FreeBSD 9.1-STABLE amd64
>Organization:
Nevermind Ltd.
>Environment:
System: FreeBSD 9.1-STABLE amd64
>Description:
Update to 5.5.30.
>How-To-Repeat:
N/A
>Fix:
Apply patch attached.
diff --git a/databases/mariadb55-server/Makefile b/databases/mariadb55-server/Makefile
index a7e3668..8d61761 100644
--- a/databases/mariadb55-server/Makefile
+++ b/databases/mariadb55-server/Makefile
@@ -1,8 +1,8 @@
# $FreeBSD: head/databases/mariadb55-server/Makefile 313604 2013-03-07 20:22:40Z flo $
PORTNAME?= mariadb
-PORTVERSION= 5.5.29
-PORTREVISION?= 1
+PORTVERSION= 5.5.30
+PORTREVISION?= 0
CATEGORIES= databases ipv6
MASTER_SITES= http://ftp.osuosl.org/pub/mariadb/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \
http://mirrors.supportex.net/mariadb/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \
diff --git a/databases/mariadb55-server/distinfo b/databases/mariadb55-server/distinfo
index a6254c8..4e1086c 100644
--- a/databases/mariadb55-server/distinfo
+++ b/databases/mariadb55-server/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mariadb-5.5.29.tar.gz) = b0e25b5451dbf8e8c8bf243bbd0aeb264db0da2caceafc7e2c9fad77b8d4be74
-SIZE (mariadb-5.5.29.tar.gz) = 27935253
+SHA256 (mariadb-5.5.30.tar.gz) = 64dba5f1819f1d4ebf7ed31d74e4106c981a24b88259995deba3734fb7c4635f
+SIZE (mariadb-5.5.30.tar.gz) = 27875216
diff --git a/databases/mariadb55-server/files/patch-libmysql_CMakeLists.txt b/databases/mariadb55-server/files/patch-libmysql_CMakeLists.txt
index 7f11bed..18eef8a 100644
--- a/databases/mariadb55-server/files/patch-libmysql_CMakeLists.txt
+++ b/databases/mariadb55-server/files/patch-libmysql_CMakeLists.txt
@@ -1,6 +1,6 @@
---- libmysql/CMakeLists.txt.orig 2010-12-03 18:58:26.000000000 +0100
-+++ libmysql/CMakeLists.txt 2010-12-23 22:01:37.000000000 +0100
-@@ -153,13 +153,14 @@
+--- libmysql/CMakeLists.txt.orig 2013-03-15 22:24:20.000000000 +0200
++++ libmysql/CMakeLists.txt 2013-03-15 22:24:34.000000000 +0200
+@@ -329,13 +329,14 @@
# Merge several convenience libraries into one big mysqlclient
# and link them together into shared library.
@@ -16,20 +16,20 @@
IF(UNIX)
MACRO(GET_VERSIONED_LIBNAME LIBNAME EXTENSION VERSION OUTNAME)
SET(DOT_VERSION ".${VERSION}")
-@@ -174,9 +175,11 @@
+@@ -350,9 +351,11 @@
ENDMACRO()
INSTALL_SYMLINK(${CMAKE_STATIC_LIBRARY_PREFIX}mysqlclient_r.a mysqlclient ${INSTALL_LIBDIR} Development)
ENDIF()
+ENDIF()
IF(NOT DISABLE_SHARED)
-- MERGE_LIBRARIES(libmysql SHARED ${LIBS} EXPORTS ${CLIENT_API_FUNCTIONS} COMPONENT SharedLibraries)
-+ MERGE_LIBRARIES(libmysql SHARED ${LIBS} EXPORTS ${CLIENT_API_FUNCTIONS} COMPONENT SharedLibraries NOINSTALL)
+- MERGE_LIBRARIES(libmysql SHARED ${LIBS} EXPORTS ${CLIENT_API_FUNCTIONS} ${CLIENT_API_EXTRA} COMPONENT SharedLibraries)
++ MERGE_LIBRARIES(libmysql SHARED ${LIBS} EXPORTS ${CLIENT_API_FUNCTIONS} ${CLIENT_API_EXTRA} COMPONENT SharedLibraries NOINSTALL)
+IF(FALSE)
IF(UNIX)
# libtool compatability
IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE)
-@@ -223,3 +226,4 @@
+@@ -399,3 +402,4 @@
ENDFOREACH()
ENDIF()
ENDIF()
diff --git a/databases/mariadb55-server/files/patch-storage_oqgraph_CMakeLists.txt b/databases/mariadb55-server/files/patch-storage_oqgraph_CMakeLists.txt
deleted file mode 100644
index 32912a6..0000000
--- a/databases/mariadb55-server/files/patch-storage_oqgraph_CMakeLists.txt
+++ /dev/null
@@ -1,10 +0,0 @@
---- storage/oqgraph/CMakeLists.txt.orig 2013-01-29 16:12:49.000000000 +0200
-+++ storage/oqgraph/CMakeLists.txt 2013-02-24 20:21:58.000000000 +0200
-@@ -3,6 +3,7 @@
- RETURN()
- ENDIF()
- INCLUDE_DIRECTORIES(BEFORE ${Boost_INCLUDE_DIRS})
-+SET(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${Boost_INCLUDE_DIRS})
-
- IF(MSVC)
- # lp:756966 OQGRAPH on Win64 does not compile
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201303152339.r2FNdlxe063900>