From owner-svn-ports-all@freebsd.org Wed Jun 7 14:38:18 2017 Return-Path: Delivered-To: svn-ports-all@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 6823DC77270; Wed, 7 Jun 2017 14:38:18 +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 3670776601; Wed, 7 Jun 2017 14:38:18 +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 v57EcHm8031761; Wed, 7 Jun 2017 14:38:17 GMT (envelope-from brnrd@FreeBSD.org) Received: (from brnrd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v57EcHM1031759; Wed, 7 Jun 2017 14:38:17 GMT (envelope-from brnrd@FreeBSD.org) Message-Id: <201706071438.v57EcHM1031759@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brnrd set sender to brnrd@FreeBSD.org using -f From: Bernard Spil Date: Wed, 7 Jun 2017 14:38:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r442843 - head/databases/mariadb102-server X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 Jun 2017 14:38:18 -0000 Author: brnrd Date: Wed Jun 7 14:38:17 2017 New Revision: 442843 URL: https://svnweb.freebsd.org/changeset/ports/442843 Log: databases/mariadb102-server: Build InnoDB engine static - Change InnoDB from Dynamic plugin to static [2] - Unbreak new installs on GIS bootstrap [1] PR: 219831 [1], 219818 [2] Submitted by: Benediktus Anindito [1] Reported by: martin@sugioarto.com [2] Modified: head/databases/mariadb102-server/Makefile head/databases/mariadb102-server/pkg-plist Modified: head/databases/mariadb102-server/Makefile ============================================================================== --- head/databases/mariadb102-server/Makefile Wed Jun 7 14:37:28 2017 (r442842) +++ head/databases/mariadb102-server/Makefile Wed Jun 7 14:38:17 2017 (r442843) @@ -2,6 +2,7 @@ PORTNAME?= mariadb PORTVERSION= 10.2.6 +PORTREVISION?= 1 CATEGORIES= databases ipv6 MASTER_SITES= http://mirrors.supportex.net/${SITESDIR}/ \ http://mirror2.hs-esslingen.de/pub/Mirrors/${SITESDIR}/ \ @@ -132,11 +133,12 @@ CMAKE_ARGS+= -DWITH_EMBEDDED_SERVER="ON" \ -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 \ -DWITHOUT_CLIENT=1 -.for ENGINE in ${OPTIONS_GROUP_ENGINES} +.for ENGINE in ${OPTIONS_GROUP_ENGINES:NINNOBASE} ${ENGINE}_CMAKE_OFF= -DPLUGIN_${ENGINE}=NO \ -DWITHOUT_${ENGINE}=1 ${ENGINE}_CMAKE_ON= -DPLUGIN_${ENGINE}=DYNAMIC .endfor +INNOBASE_CMAKE_OFF= -DPLUGIN_INNOBASE=NO -DWITHOUT_INNOBASE=1 CONNECT_EXTRA_LIB_DEPENDS= libodbc.so:databases/unixODBC CONNECT_EXTRA_USE= gnome=libxml2 Modified: head/databases/mariadb102-server/pkg-plist ============================================================================== --- head/databases/mariadb102-server/pkg-plist Wed Jun 7 14:37:28 2017 (r442842) +++ head/databases/mariadb102-server/pkg-plist Wed Jun 7 14:38:17 2017 (r442843) @@ -3,6 +3,7 @@ bin/aria_dump_log bin/aria_ftdump bin/aria_pack bin/aria_read_log +bin/innochecksum bin/my_print_defaults bin/myisam_ftdump bin/myisamchk @@ -124,7 +125,6 @@ lib/mysql/plugin/ha_blackhole.so lib/mysql/plugin/ha_connect.so lib/mysql/plugin/ha_federated.so lib/mysql/plugin/ha_federatedx.so -%%INNOBASE%%lib/mysql/plugin/ha_innobase.so %%MROONGA%%lib/mysql/plugin/ha_mroonga.so %%OQGRAPH%%lib/mysql/plugin/ha_oqgraph.so %%ROCKSDB%%lib/mysql/plugin/ha_rocksdb.so @@ -194,7 +194,7 @@ man/man8/mysqld.8.gz %%DATADIR%%/magic %%SPIDER%%%%DATADIR%%/install_spider.sql @comment %%DATADIR%%/maria_add_gis_sp.sql -@comment %%DATADIR%%/maria_add_gis_sp_bootstrap.sql +%%DATADIR%%/maria_add_gis_sp_bootstrap.sql %%MROONGA%%%%DATADIR%%/mroonga/install.sql %%MROONGA%%%%DATADIR%%/mroonga/uninstall.sql %%DATADIR%%/my-huge.cnf