diff options
| author | Florian Smeets <flo@FreeBSD.org> | 2014-11-25 11:27:57 +0000 |
|---|---|---|
| committer | Florian Smeets <flo@FreeBSD.org> | 2014-11-25 11:27:57 +0000 |
| commit | ca199c0364bfa51f8798c87712540877293b3792 (patch) | |
| tree | 5e467c86473446834f4bd4ee67c33a6f9cb16773 /databases/percona55-client | |
| parent | b5bb112135b49aebd78e95314a255437c8565441 (diff) | |
Update to 5.5.40-36.1
Update CONFLICTS [1]
PR: 194820 [1]
Submitted by: Bernard Spil <spil.oss@gmail.com> [1]
Notes
Notes:
svn path=/head/; revision=373398
Diffstat (limited to 'databases/percona55-client')
| -rw-r--r-- | databases/percona55-client/Makefile | 5 | ||||
| -rw-r--r-- | databases/percona55-client/files/patch-CMakeLists.txt | 17 |
2 files changed, 13 insertions, 9 deletions
diff --git a/databases/percona55-client/Makefile b/databases/percona55-client/Makefile index ba96157ec754..c7a67f072362 100644 --- a/databases/percona55-client/Makefile +++ b/databases/percona55-client/Makefile @@ -11,9 +11,12 @@ PKGMESSAGE= mustnotexist PATCHDIR= ${.CURDIR}/files PLIST= ${.CURDIR}/pkg-plist -CONFLICTS_INSTALL= mysql[0-9][0-9]-client-* mariadb[0-9][0-9]-client-* percona5.[0-46-9]-client-* percona[0-46-9][0-9]-client-* +CONFLICTS_INSTALL= mysql*-client-* \ + mariadb*-client-* \ + percona5[0-46-9]-client-* CMAKE_ARGS+= -DWITHOUT_SERVER=1 +CMAKE_ARGS+= -DENABLE_DTRACE=OFF USE_LDCONFIG= ${PREFIX}/lib/mysql diff --git a/databases/percona55-client/files/patch-CMakeLists.txt b/databases/percona55-client/files/patch-CMakeLists.txt index d677a2c75ac8..3636f8cf76b1 100644 --- a/databases/percona55-client/files/patch-CMakeLists.txt +++ b/databases/percona55-client/files/patch-CMakeLists.txt @@ -1,6 +1,6 @@ ---- CMakeLists.txt.orig 2013-05-16 17:47:15.000000000 +0200 -+++ CMakeLists.txt 2013-06-12 09:22:45.000000000 +0200 -@@ -305,32 +305,11 @@ +--- CMakeLists.txt.orig 2014-10-06 18:02:58.000000000 +0200 ++++ CMakeLists.txt 2014-10-17 20:59:57.890024727 +0200 +@@ -419,31 +419,12 @@ ENDIF() ADD_SUBDIRECTORY(extra) @@ -27,9 +27,9 @@ - IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt) - ADD_SUBDIRECTORY(internal) - ENDIF() -- ADD_SUBDIRECTORY(packaging/rpm-uln) - ADD_SUBDIRECTORY(packaging/rpm-oel) -ENDIF() ++ +ADD_SUBDIRECTORY(client) +ADD_SUBDIRECTORY(libservices) +ADD_SUBDIRECTORY(support-files) @@ -38,7 +38,7 @@ INCLUDE(cmake/abi_check.cmake) INCLUDE(cmake/tags.cmake) -@@ -365,8 +345,10 @@ +@@ -479,19 +460,21 @@ ELSE() SET(CPACK_GENERATOR "TGZ") ENDIF() @@ -49,9 +49,8 @@ # Create a single package with "make package" # (see http://public.kitware.com/Bug/view.php?id=11452) -@@ -374,11 +356,11 @@ + SET(CPACK_MONOLITHIC_INSTALL 1 CACHE INTERNAL "") - INCLUDE(CPack) IF(UNIX) - INSTALL(FILES Docs/mysql.info DESTINATION ${INSTALL_INFODIR} OPTIONAL COMPONENT Info) ENDIF() @@ -62,8 +61,10 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM") INSTALL(FILES COPYING LICENSE.mysql DESTINATION ${INSTALL_DOCREADMEDIR} -@@ -404,3 +386,4 @@ +@@ -518,5 +501,6 @@ PATTERN "sp-imp-spec.txt" EXCLUDE ) ENDIF() +ENDIF() + + INCLUDE(CPack) |