Attachment #138898 for bug #185012

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

Lines 1-7 Link Here

(-)b/databases/mariadb55-client/Makefile (-1 / +1 lines)
1	# $FreeBSD: head/databases/mariadb55-client/Makefile 330601 2013-10-17 05:16:44Z flo $	1	# $FreeBSD: head/databases/mariadb55-client/Makefile 330601 2013-10-17 05:16:44Z flo $
2		2
3	PORTNAME= mariadb	3	PORTNAME= mariadb
4	PORTREVISION= 1	4	PORTREVISION= 0
5	PKGNAMESUFFIX= 55-client	5	PKGNAMESUFFIX= 55-client
6		6
7	COMMENT= Multithreaded SQL database (client)	7	COMMENT= Multithreaded SQL database (client)




--- cmake/os/FreeBSD.cmake.orig	2013-09-27 00:09:44.000000000 +0300
+++ cmake/os/FreeBSD.cmake	2013-09-27 00:09:57.000000000 +0300
@@ -24,9 +24,10 @@
 # ADD_DEFINITIONS(-DHAVE_BROKEN_REALPATH)
 
 # Find libexecinfo (library that contains backtrace_symbols etc)
-INCLUDE_DIRECTORIES(/usr/local/include)
-SET(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} /usr/local/include )
-SET(ENV{LIB} "$ENV{LIB}:/usr/local/lib")
+SET(EXECINFO_ROOT /usr/local CACHE INTERNAL "Where to find execinfo library and header")
+INCLUDE_DIRECTORIES(${EXECINFO_ROOT}/include)
+SET(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${EXECINFO_ROOT}/include)
+SET(ENV{LIB} "$ENV{LIB}:${EXECINFO_ROOT}/lib")
 FIND_LIBRARY(EXECINFO NAMES execinfo)
 IF(EXECINFO)
  SET(LIBEXECINFO ${EXECINFO})

Lines 1-8 Link Here

(-)b/databases/mariadb55-server/Makefile (-2 / +2 lines)
1	# $FreeBSD: head/databases/mariadb55-server/Makefile 336187 2013-12-11 18:08:52Z bapt $	1	# $FreeBSD: head/databases/mariadb55-server/Makefile 336187 2013-12-11 18:08:52Z bapt $
2		2
3	PORTNAME?= mariadb	3	PORTNAME?= mariadb
4	PORTVERSION= 5.5.33a	4	PORTVERSION= 5.5.34
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.33a.tar.gz) = adf4d04087177fde6568082c3fee77e52e84dc3ae4eb5b994d5defaaa8c83d5b	1	SHA256 (mariadb-5.5.34.tar.gz) = a4d8b54be0f5784924629a1e87dbbccc4c0aaf537c76951e265625deda322f89
2	SIZE (mariadb-5.5.33a.tar.gz) = 45226492	2	SIZE (mariadb-5.5.34.tar.gz) = 45683350




--- cmake/os/FreeBSD.cmake.orig	2013-09-27 00:09:44.000000000 +0300
+++ cmake/os/FreeBSD.cmake	2013-09-27 00:09:57.000000000 +0300
@@ -24,9 +24,10 @@
 # ADD_DEFINITIONS(-DHAVE_BROKEN_REALPATH)
 
 # Find libexecinfo (library that contains backtrace_symbols etc)
-INCLUDE_DIRECTORIES(/usr/local/include)
-SET(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} /usr/local/include )
-SET(ENV{LIB} "$ENV{LIB}:/usr/local/lib")
+SET(EXECINFO_ROOT /usr/local CACHE INTERNAL "Where to find execinfo library and header")
+INCLUDE_DIRECTORIES(${EXECINFO_ROOT}/include)
+SET(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${EXECINFO_ROOT}/include)
+SET(ENV{LIB} "$ENV{LIB}:${EXECINFO_ROOT}/lib")
 FIND_LIBRARY(EXECINFO NAMES execinfo)
 IF(EXECINFO)
  SET(LIBEXECINFO ${EXECINFO})

Return to bug 185012

Removed Link Here

(-)a/databases/mariadb55-client/files/patch-cmake_os_FreeBSD.cmake (-16 lines)
1	--- cmake/os/FreeBSD.cmake.orig 2013-09-27 00:09:44.000000000 +0300
2	+++ cmake/os/FreeBSD.cmake 2013-09-27 00:09:57.000000000 +0300
3	@@ -24,9 +24,10 @@
4	# ADD_DEFINITIONS(-DHAVE_BROKEN_REALPATH)
5
6	# Find libexecinfo (library that contains backtrace_symbols etc)
7	-INCLUDE_DIRECTORIES(/usr/local/include)
8	-SET(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} /usr/local/include )
9	-SET(ENV{LIB} "$ENV{LIB}:/usr/local/lib")
10	+SET(EXECINFO_ROOT /usr/local CACHE INTERNAL "Where to find execinfo library and header")
11	+INCLUDE_DIRECTORIES(${EXECINFO_ROOT}/include)
12	+SET(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${EXECINFO_ROOT}/include)
13	+SET(ENV{LIB} "$ENV{LIB}:${EXECINFO_ROOT}/lib")
14	FIND_LIBRARY(EXECINFO NAMES execinfo)
15	IF(EXECINFO)
16	SET(LIBEXECINFO ${EXECINFO})

Removed Link Here

(-)a/databases/mariadb55-server/files/patch-cmake_os_FreeBSD.cmake (-16 lines)
1	--- cmake/os/FreeBSD.cmake.orig 2013-09-27 00:09:44.000000000 +0300
2	+++ cmake/os/FreeBSD.cmake 2013-09-27 00:09:57.000000000 +0300
3	@@ -24,9 +24,10 @@
4	# ADD_DEFINITIONS(-DHAVE_BROKEN_REALPATH)
5
6	# Find libexecinfo (library that contains backtrace_symbols etc)
7	-INCLUDE_DIRECTORIES(/usr/local/include)
8	-SET(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} /usr/local/include )
9	-SET(ENV{LIB} "$ENV{LIB}:/usr/local/lib")
10	+SET(EXECINFO_ROOT /usr/local CACHE INTERNAL "Where to find execinfo library and header")
11	+INCLUDE_DIRECTORIES(${EXECINFO_ROOT}/include)
12	+SET(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${EXECINFO_ROOT}/include)
13	+SET(ENV{LIB} "$ENV{LIB}:${EXECINFO_ROOT}/lib")
14	FIND_LIBRARY(EXECINFO NAMES execinfo)
15	IF(EXECINFO)
16	SET(LIBEXECINFO ${EXECINFO})