Date: Tue, 25 Nov 2014 11:27:58 +0000 (UTC) From: Florian Smeets <flo@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r373398 - in head/databases: percona55-client percona55-client/files percona55-server Message-ID: <201411251127.sAPBRwbl001647@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: flo Date: Tue Nov 25 11:27:57 2014 New Revision: 373398 URL: https://svnweb.freebsd.org/changeset/ports/373398 QAT: https://qat.redports.org/buildarchive/r373398/ Log: Update to 5.5.40-36.1 Update CONFLICTS [1] PR: 194820 [1] Submitted by: Bernard Spil <spil.oss@gmail.com> [1] Modified: head/databases/percona55-client/Makefile head/databases/percona55-client/files/patch-CMakeLists.txt head/databases/percona55-server/Makefile head/databases/percona55-server/distinfo Modified: head/databases/percona55-client/Makefile ============================================================================== --- head/databases/percona55-client/Makefile Tue Nov 25 10:47:09 2014 (r373397) +++ head/databases/percona55-client/Makefile Tue Nov 25 11:27:57 2014 (r373398) @@ -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 Modified: head/databases/percona55-client/files/patch-CMakeLists.txt ============================================================================== --- head/databases/percona55-client/files/patch-CMakeLists.txt Tue Nov 25 10:47:09 2014 (r373397) +++ head/databases/percona55-client/files/patch-CMakeLists.txt Tue Nov 25 11:27:57 2014 (r373398) @@ -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) Modified: head/databases/percona55-server/Makefile ============================================================================== --- head/databases/percona55-server/Makefile Tue Nov 25 10:47:09 2014 (r373397) +++ head/databases/percona55-server/Makefile Tue Nov 25 11:27:57 2014 (r373398) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME?= percona -DISTVERSION= 5.5.38-35.2 +DISTVERSION= 5.5.40-36.1 PORTREVISION?= 0 CATEGORIES= databases ipv6 MASTER_SITES= http://www.percona.com/downloads/Percona-Server-5.5/Percona-Server-${DISTVERSION}/source/tarball/ @@ -40,7 +40,8 @@ CMAKE_ARGS+= -DINSTALL_DOCDIR="share/doc -DWITH_LIBEDIT=0 \ -DWITH_LIBWRAP=1 \ -DHAVE_PAM=0 \ - -DWITH_UNIT_TESTS=0 + -DWITH_UNIT_TESTS=0 \ + -DENABLE_DTRACE=OFF SHEBANG_FILES= scripts/*.pl* scripts/*.sh @@ -62,7 +63,9 @@ CMAKE_ARGS+= -DWITH_FAST_MUTEXES=1 USE_MYSQL= yes WANT_MYSQL_VER= 55p -CONFLICTS_INSTALL= mysql[0-9][0-9]-server-* mariadb[0-9][0-9]-server-* percona5.[0-46-9]-server-* percona[0-46-9][0-9]-server-* +CONFLICTS_INSTALL= mysql*-server-* \ + mariadb*-server-* \ + percona5[0-46-9]-server-* USE_RC_SUBR= mysql-server Modified: head/databases/percona55-server/distinfo ============================================================================== --- head/databases/percona55-server/distinfo Tue Nov 25 10:47:09 2014 (r373397) +++ head/databases/percona55-server/distinfo Tue Nov 25 11:27:57 2014 (r373398) @@ -1,2 +1,2 @@ -SHA256 (percona-server-5.5.38-35.2.tar.gz) = 2726d8443a4e87e1a1f11c56dfcd1aa79a5a2ff8cbff9f229c8589cdedbf031d -SIZE (percona-server-5.5.38-35.2.tar.gz) = 22946764 +SHA256 (percona-server-5.5.40-36.1.tar.gz) = 33b2a66c2a221ec4e02b38f065f5a8fbbe5fdcaaf00e0ae5f267d4e2b746ffb4 +SIZE (percona-server-5.5.40-36.1.tar.gz) = 22710586
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201411251127.sAPBRwbl001647>