Attachment #132672 for bug #177009

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

Lines 1-8 Link Here

(-)b/databases/mariadb55-server/Makefile (-2 / +2 lines)
1	# $FreeBSD: head/databases/mariadb55-server/Makefile 313604 2013-03-07 20:22:40Z flo $	1	# $FreeBSD: head/databases/mariadb55-server/Makefile 313604 2013-03-07 20:22:40Z flo $
2		2
3	PORTNAME?= mariadb	3	PORTNAME?= mariadb
4	PORTVERSION= 5.5.29	4	PORTVERSION= 5.5.30
5	PORTREVISION?= 1	5	PORTREVISION?= 0
6	CATEGORIES= databases ipv6	6	CATEGORIES= databases ipv6
7	MASTER_SITES= http://ftp.osuosl.org/pub/mariadb/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \	7	MASTER_SITES= http://ftp.osuosl.org/pub/mariadb/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \
8	http://mirrors.supportex.net/mariadb/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \	8	http://mirrors.supportex.net/mariadb/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \

Lines 1-2 Link Here

(-)b/databases/mariadb55-server/distinfo (-2 / +2 lines)
1	SHA256 (mariadb-5.5.29.tar.gz) = b0e25b5451dbf8e8c8bf243bbd0aeb264db0da2caceafc7e2c9fad77b8d4be74	1	SHA256 (mariadb-5.5.30.tar.gz) = 64dba5f1819f1d4ebf7ed31d74e4106c981a24b88259995deba3734fb7c4635f
2	SIZE (mariadb-5.5.29.tar.gz) = 27935253	2	SIZE (mariadb-5.5.30.tar.gz) = 27875216




--- 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.

 IF(UNIX)
   MACRO(GET_VERSIONED_LIBNAME LIBNAME EXTENSION VERSION OUTNAME)
     SET(DOT_VERSION ".${VERSION}")
@@ -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} ${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)
@@ -399,3 +402,4 @@
     ENDFOREACH()
   ENDIF()
 ENDIF()

Removed Link Here

(-)a/databases/mariadb55-server/files/patch-storage_oqgraph_CMakeLists.txt (-10 lines)
1	--- storage/oqgraph/CMakeLists.txt.orig 2013-01-29 16:12:49.000000000 +0200
2	+++ storage/oqgraph/CMakeLists.txt 2013-02-24 20:21:58.000000000 +0200
3	@@ -3,6 +3,7 @@
4	RETURN()
5	ENDIF()
6	INCLUDE_DIRECTORIES(BEFORE ${Boost_INCLUDE_DIRS})
7	+SET(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${Boost_INCLUDE_DIRS})
8
9	IF(MSVC)
10	# lp:756966 OQGRAPH on Win64 does not compile

Return to bug 177009

Lines 1-6 Link Here

(-)b/databases/mariadb55-server/files/patch-libmysql_CMakeLists.txt (-7 / +7 lines)
1	--- libmysql/CMakeLists.txt.orig 2010-12-03 18:58:26.000000000 +0100	1	--- libmysql/CMakeLists.txt.orig 2013-03-15 22:24:20.000000000 +0200
2	+++ libmysql/CMakeLists.txt 2010-12-23 22:01:37.000000000 +0100	2	+++ libmysql/CMakeLists.txt 2013-03-15 22:24:34.000000000 +0200
3	@@ -153,13 +153,14 @@	3	@@ -329,13 +329,14 @@
4		4
5	# Merge several convenience libraries into one big mysqlclient	5	# Merge several convenience libraries into one big mysqlclient
6	# and link them together into shared library.	6	# and link them together into shared library.
Lines 16-35 Link Here
16	IF(UNIX)	16	IF(UNIX)
17	MACRO(GET_VERSIONED_LIBNAME LIBNAME EXTENSION VERSION OUTNAME)	17	MACRO(GET_VERSIONED_LIBNAME LIBNAME EXTENSION VERSION OUTNAME)
18	SET(DOT_VERSION ".${VERSION}")	18	SET(DOT_VERSION ".${VERSION}")
19	@@ -174,9 +175,11 @@	19	@@ -350,9 +351,11 @@
20	ENDMACRO()	20	ENDMACRO()
21	INSTALL_SYMLINK(${CMAKE_STATIC_LIBRARY_PREFIX}mysqlclient_r.a mysqlclient ${INSTALL_LIBDIR} Development)	21	INSTALL_SYMLINK(${CMAKE_STATIC_LIBRARY_PREFIX}mysqlclient_r.a mysqlclient ${INSTALL_LIBDIR} Development)
22	ENDIF()	22	ENDIF()
23	+ENDIF()	23	+ENDIF()
24		24
25	IF(NOT DISABLE_SHARED)	25	IF(NOT DISABLE_SHARED)
26	- MERGE_LIBRARIES(libmysql SHARED ${LIBS} EXPORTS ${CLIENT_API_FUNCTIONS} COMPONENT SharedLibraries)	26	- MERGE_LIBRARIES(libmysql SHARED ${LIBS} EXPORTS ${CLIENT_API_FUNCTIONS} ${CLIENT_API_EXTRA} COMPONENT SharedLibraries)
27	+ MERGE_LIBRARIES(libmysql SHARED ${LIBS} EXPORTS ${CLIENT_API_FUNCTIONS} COMPONENT SharedLibraries NOINSTALL)	27	+ MERGE_LIBRARIES(libmysql SHARED ${LIBS} EXPORTS ${CLIENT_API_FUNCTIONS} ${CLIENT_API_EXTRA} COMPONENT SharedLibraries NOINSTALL)
28	+IF(FALSE)	28	+IF(FALSE)
29	IF(UNIX)	29	IF(UNIX)
30	# libtool compatability	30	# libtool compatability
31	IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE)	31	IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE)
32	@@ -223,3 +226,4 @@	32	@@ -399,3 +402,4 @@
33	ENDFOREACH()	33	ENDFOREACH()
34	ENDIF()	34	ENDIF()
35	ENDIF()	35	ENDIF()