summaryrefslogtreecommitdiff
path: root/databases/mariadb55-client/files
diff options
context:
space:
mode:
authorFlorian Smeets <flo@FreeBSD.org>2013-02-01 22:42:55 +0000
committerFlorian Smeets <flo@FreeBSD.org>2013-02-01 22:42:55 +0000
commitc7fd019365e66aa62e34b5a696bd7157ad290b25 (patch)
treefef3b08e017486d36278f504083d09476caeb09c /databases/mariadb55-client/files
parentValyria Tear is an attempt at creating a free (as meant in the Gnu (diff)
- update databases/mariadb-server to 5.3.12 [1]
- update databases/mariadb55-server 5.5.29 [2] PR: ports/175764 [1] PR: ports/175767 [2] Submitted by: Geoffroy Desvernay <dgeo@centrale-marseille.fr> (maintainer) [1] Submitted by: Alexandr Kovalenko <never@nevermind.kiev.ua> (maintainer) [2] Security: 8c773d7f-6cbb-11e2-b242-c8600054b392
Diffstat (limited to 'databases/mariadb55-client/files')
-rw-r--r--databases/mariadb55-client/files/patch-CMakeLists.txt32
1 files changed, 11 insertions, 21 deletions
diff --git a/databases/mariadb55-client/files/patch-CMakeLists.txt b/databases/mariadb55-client/files/patch-CMakeLists.txt
index 494f4e27e520..82d2cd9c3421 100644
--- a/databases/mariadb55-client/files/patch-CMakeLists.txt
+++ b/databases/mariadb55-client/files/patch-CMakeLists.txt
@@ -1,18 +1,12 @@
---- CMakeLists.txt.orig 2012-11-28 17:49:36.000000000 +0200
-+++ CMakeLists.txt 2012-12-23 01:47:47.000000000 +0200
-@@ -298,34 +298,13 @@
- ADD_SUBDIRECTORY(regex)
- ADD_SUBDIRECTORY(mysys)
- ADD_SUBDIRECTORY(libmysql)
--ADD_SUBDIRECTORY(client)
+--- CMakeLists.txt.orig 2013-01-29 16:12:48.000000000 +0200
++++ CMakeLists.txt 2013-02-01 20:09:31.000000000 +0200
+@@ -303,28 +303,8 @@
ADD_SUBDIRECTORY(extra)
-+
-+ADD_SUBDIRECTORY(client)
ADD_SUBDIRECTORY(libservices)
--ADD_SUBDIRECTORY(scripts)
+ ADD_SUBDIRECTORY(scripts)
-ADD_SUBDIRECTORY(sql/share)
ADD_SUBDIRECTORY(support-files)
--
+
-IF(NOT WITHOUT_SERVER)
- ADD_SUBDIRECTORY(tests)
- ADD_SUBDIRECTORY(sql)
@@ -29,17 +23,13 @@
- IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt)
- ADD_SUBDIRECTORY(internal)
- ENDIF()
+- ADD_SUBDIRECTORY(packaging/rpm-uln)
-ENDIF()
-
--IF(UNIX)
-- ADD_SUBDIRECTORY(man)
--ENDIF()
-+ADD_SUBDIRECTORY(scripts)
-+ADD_SUBDIRECTORY(man)
-
- INCLUDE(cmake/abi_check.cmake)
- INCLUDE(cmake/tags.cmake)
-@@ -360,6 +339,7 @@
+ IF(UNIX)
+ ADD_SUBDIRECTORY(man)
+ ENDIF()
+@@ -362,6 +342,7 @@
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
)
@@ -47,7 +37,7 @@
INSTALL(FILES COPYING COPYING.LESSER LICENSE.mysql
DESTINATION ${INSTALL_DOCREADMEDIR}
COMPONENT Readme
-@@ -370,6 +350,7 @@
+@@ -372,6 +353,7 @@
IF(UNIX)
INSTALL(FILES Docs/INSTALL-BINARY DESTINATION ${INSTALL_DOCREADMEDIR} COMPONENT Readme)
ENDIF()