From owner-svn-ports-branches@freebsd.org Sun Sep 18 10:39:39 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B30C8BD7920; Sun, 18 Sep 2016 10:39:39 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 90FC5846; Sun, 18 Sep 2016 10:39:39 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u8IAdcYr064908; Sun, 18 Sep 2016 10:39:38 GMT (envelope-from brnrd@FreeBSD.org) Received: (from brnrd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u8IAdcVX064906; Sun, 18 Sep 2016 10:39:38 GMT (envelope-from brnrd@FreeBSD.org) Message-Id: <201609181039.u8IAdcVX064906@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brnrd set sender to brnrd@FreeBSD.org using -f From: Bernard Spil Date: Sun, 18 Sep 2016 10:39:38 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r422368 - in branches/2016Q3/databases/mariadb101-server: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 Sep 2016 10:39:39 -0000 Author: brnrd Date: Sun Sep 18 10:39:38 2016 New Revision: 422368 URL: https://svnweb.freebsd.org/changeset/ports/422368 Log: MFH: r418977 databases/mariadb101-server: Fix lz4 linking fix - Remove some testing leftover - Fix patch error Approved by: ports-secteam Modified: branches/2016Q3/databases/mariadb101-server/Makefile branches/2016Q3/databases/mariadb101-server/files/patch-storage_oqgraph_oqgraph__shim.h Directory Properties: branches/2016Q3/ (props changed) Modified: branches/2016Q3/databases/mariadb101-server/Makefile ============================================================================== --- branches/2016Q3/databases/mariadb101-server/Makefile Sun Sep 18 10:38:16 2016 (r422367) +++ branches/2016Q3/databases/mariadb101-server/Makefile Sun Sep 18 10:39:38 2016 (r422368) @@ -27,7 +27,7 @@ SUB_FILES= pkg-message PKGMESSAGE= ${WRKDIR}/pkg-message SLAVEDIRS= databases/mariadb101-client -USES= bison:build cmake compiler:c++11-lib cpe execinfo shebangfix +USES= bison:build cmake compiler:c++11-lib cpe execinfo ssl shebangfix USE_LDCONFIG= ${PREFIX}/lib/mysql SHEBANG_FILES= scripts/*.sh SITESDIR= mariadb/mariadb-${PORTVERSION}/source @@ -95,7 +95,6 @@ CONFLICTS_INSTALL= mariadb5*-${PKGNAMESU mysql[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \ percona[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* -USE_OPENSSL= yes FASTMTX_CMAKE_ON= -DWITH_FAST_MUTEXES=1 OPTIONS_SUB= yes @@ -105,8 +104,8 @@ USES+= readline GSSAPI_NONE_CMAKE_ON= -DPLUGIN_AUTH_GSSAPI_CLIENT=NO .else # MySQL-Server part -USE_MYSQL= yes -WANT_MYSQL_VER= 101m +USES+= mysql:101m +USE_GNOME= libxml2 USE_LDCONFIG+= ${PREFIX}/lib/mysql/plugin USE_RC_SUBR= mysql-server USERS= mysql @@ -123,6 +122,7 @@ ${ENGINE}_CMAKE_OFF= -DPLUGIN_${ENGINE}= GSSAPI_NONE_CMAKE_ON= -DPLUGIN_AUTH_GSSAPI=NO MAXKEY_EXTRA_PATCHES+= ${FILESDIR}/extra-patch-include_my__compare.h +MROONGA_LIB_DEPENDS= liblz4.so:archivers/liblz4 OQGRAPH_LIB_DEPENDS= libboost_system.so:devel/boost-libs \ libJudy.so:devel/judy TOKUDB_LIB_DEPENDS= libsnappy.so:archivers/snappy @@ -172,4 +172,10 @@ post-patch: ${WRKSRC}/cmake/os/DragonFly.cmake .endif +.if exists(${WRKSRC}/storage/mroonga/CMakeFiles/mroonga.dir/link.txt) +post-configure: + @${REINPLACE_CMD} "s|/usr/bin/c++ |/usr/bin/c++ -L${LOCALBASE}/lib |" \ + ${WRKSRC}/storage/mroonga/CMakeFiles/mroonga.dir/link.txt +.endif + .include Modified: branches/2016Q3/databases/mariadb101-server/files/patch-storage_oqgraph_oqgraph__shim.h ============================================================================== --- branches/2016Q3/databases/mariadb101-server/files/patch-storage_oqgraph_oqgraph__shim.h Sun Sep 18 10:38:16 2016 (r422367) +++ branches/2016Q3/databases/mariadb101-server/files/patch-storage_oqgraph_oqgraph__shim.h Sun Sep 18 10:39:38 2016 (r422368) @@ -3,15 +3,6 @@ https://jira.mariadb.org/projects/MDEV/i --- storage/oqgraph/oqgraph_shim.h.orig 2016-01-28 12:12:55 UTC +++ storage/oqgraph/oqgraph_shim.h -@@ -254,7 +254,7 @@ namespace boost - typedef no_property type; - }; - --#if BOOST_VERSION >= 104601 -+#if BOOST_VERSION >= 104601 && BOOST_VERSION < 104900 - template <> - struct graph_bundle_type - { @@ -274,6 +274,33 @@ namespace boost }; #endif