From never@naia.nevermind.kiev.ua  Fri Mar 15 23:40:06 2013
Return-Path: <never@naia.nevermind.kiev.ua>
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
	by hub.freebsd.org (Postfix) with ESMTP id A059D849
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 15 Mar 2013 23:40:06 +0000 (UTC)
	(envelope-from never@naia.nevermind.kiev.ua)
Received: from naia.nevermind.kiev.ua (naia.nevermind.kiev.ua [109.106.1.82])
	by mx1.freebsd.org (Postfix) with ESMTP id 2B15B661
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 15 Mar 2013 23:40:05 +0000 (UTC)
Received: from naia.nevermind.kiev.ua (localhost [127.0.0.1])
	by naia.nevermind.kiev.ua (8.14.6/8.14.6) with ESMTP id r2FNdlow063901
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 16 Mar 2013 01:39:47 +0200 (EET)
	(envelope-from never@naia.nevermind.kiev.ua)
Received: (from never@localhost)
	by naia.nevermind.kiev.ua (8.14.6/8.14.6/Submit) id r2FNdlxe063900;
	Sat, 16 Mar 2013 01:39:47 +0200 (EET)
	(envelope-from never)
Message-Id: <201303152339.r2FNdlxe063900@naia.nevermind.kiev.ua>
Date: Sat, 16 Mar 2013 01:39:47 +0200 (EET)
From: Alexandr Kovalenko <never@nevermind.kiev.ua>
Reply-To: Alexandr Kovalenko <never@nevermind.kiev.ua>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [MAINTAINER] Update databases/mariadb55-{client,server} to 5.5.30
X-Send-Pr-Version: 3.114
X-GNATS-Notify:

>Number:         177009
>Category:       ports
>Synopsis:       [MAINTAINER] Update databases/mariadb55-{client,server} to 5.5.30
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    flo
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Mar 15 23:50:00 UTC 2013
>Closed-Date:    Sat Mar 16 00:35:58 UTC 2013
>Last-Modified:  Sat Mar 16 00:40:00 UTC 2013
>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:
Responsible-Changed-From-To: freebsd-ports-bugs->flo 
Responsible-Changed-By: flo 
Responsible-Changed-When: Fri Mar 15 23:53:15 UTC 2013 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=177009 
State-Changed-From-To: open->closed 
State-Changed-By: flo 
State-Changed-When: Sat Mar 16 00:35:58 UTC 2013 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=177009 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/177009: commit references a PR
Date: Sat, 16 Mar 2013 00:35:56 +0000 (UTC)

 Author: flo
 Date: Sat Mar 16 00:35:47 2013
 New Revision: 314329
 URL: http://svnweb.freebsd.org/changeset/ports/314329
 
 Log:
   Update to 5.5.30
   
   PR:		ports/177009
   Submitted by:	Alexandr Kovalenko <never@nevermind.kiev.ua> (maintainer)
 
 Deleted:
   head/databases/mariadb55-server/files/patch-storage_oqgraph_CMakeLists.txt
 Modified:
   head/databases/mariadb55-server/Makefile
   head/databases/mariadb55-server/distinfo
   head/databases/mariadb55-server/files/patch-libmysql_CMakeLists.txt
 
 Modified: head/databases/mariadb55-server/Makefile
 ==============================================================================
 --- head/databases/mariadb55-server/Makefile	Fri Mar 15 22:41:58 2013	(r314328)
 +++ head/databases/mariadb55-server/Makefile	Sat Mar 16 00:35:47 2013	(r314329)
 @@ -1,8 +1,8 @@
  # $FreeBSD$
  
  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/ \
 
 Modified: head/databases/mariadb55-server/distinfo
 ==============================================================================
 --- head/databases/mariadb55-server/distinfo	Fri Mar 15 22:41:58 2013	(r314328)
 +++ head/databases/mariadb55-server/distinfo	Sat Mar 16 00:35:47 2013	(r314329)
 @@ -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
 
 Modified: head/databases/mariadb55-server/files/patch-libmysql_CMakeLists.txt
 ==============================================================================
 --- head/databases/mariadb55-server/files/patch-libmysql_CMakeLists.txt	Fri Mar 15 22:41:58 2013	(r314328)
 +++ head/databases/mariadb55-server/files/patch-libmysql_CMakeLists.txt	Sat Mar 16 00:35:47 2013	(r314329)
 @@ -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()
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
