From owner-svn-ports-head@freebsd.org Sun Dec 1 19:50:46 2019 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id D531C1B5F75; Sun, 1 Dec 2019 19:50:46 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47QzPf5KLkz4BGn; Sun, 1 Dec 2019 19:50:46 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9719B1BA93; Sun, 1 Dec 2019 19:50:46 +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 xB1JokaV089515; Sun, 1 Dec 2019 19:50:46 GMT (envelope-from brnrd@FreeBSD.org) Received: (from brnrd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xB1Jok2q089514; Sun, 1 Dec 2019 19:50:46 GMT (envelope-from brnrd@FreeBSD.org) Message-Id: <201912011950.xB1Jok2q089514@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brnrd set sender to brnrd@FreeBSD.org using -f From: Bernard Spil Date: Sun, 1 Dec 2019 19:50:46 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r518809 - in head/databases/mariadb104-server: . files X-SVN-Group: ports-head X-SVN-Commit-Author: brnrd X-SVN-Commit-Paths: in head/databases/mariadb104-server: . files X-SVN-Commit-Revision: 518809 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 Dec 2019 19:50:46 -0000 Author: brnrd Date: Sun Dec 1 19:50:45 2019 New Revision: 518809 URL: https://svnweb.freebsd.org/changeset/ports/518809 Log: databases/mariadb104-server: Fix include clash with c++/v1/version Added: head/databases/mariadb104-server/files/patch-storage_mroonga_CMakeLists.txt - copied unchanged from r518787, head/databases/mariadb103-server/files/patch-storage_mroonga_CMakeLists.txt Modified: head/databases/mariadb104-server/Makefile Modified: head/databases/mariadb104-server/Makefile ============================================================================== --- head/databases/mariadb104-server/Makefile Sun Dec 1 19:48:08 2019 (r518808) +++ head/databases/mariadb104-server/Makefile Sun Dec 1 19:50:45 2019 (r518809) @@ -192,6 +192,7 @@ post-patch: ${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/mysys/my_default.c ${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/scripts/mysql_config.sh \ ${WRKSRC}/storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake + ${MV} ${WRKSRC}/storage/mroonga/version ${WRKSRC}/storage/mroonga/version_txt .if ${OPSYS} == DragonFly ${CP} ${WRKSRC}/cmake/os/FreeBSD.cmake \ ${WRKSRC}/cmake/os/DragonFly.cmake Copied: head/databases/mariadb104-server/files/patch-storage_mroonga_CMakeLists.txt (from r518787, head/databases/mariadb103-server/files/patch-storage_mroonga_CMakeLists.txt) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/mariadb104-server/files/patch-storage_mroonga_CMakeLists.txt Sun Dec 1 19:50:45 2019 (r518809, copy of r518787, head/databases/mariadb103-server/files/patch-storage_mroonga_CMakeLists.txt) @@ -0,0 +1,11 @@ +--- storage/mroonga/CMakeLists.txt.orig 2019-11-06 16:01:58 UTC ++++ storage/mroonga/CMakeLists.txt +@@ -80,7 +80,7 @@ else() + set(MRN_SOURCE_DIR ${CMAKE_SOURCE_DIR}) + endif() + +-file(READ ${MRN_SOURCE_DIR}/version MRN_VERSION) ++file(READ ${MRN_SOURCE_DIR}/version_txt MRN_VERSION) + file(READ ${MRN_SOURCE_DIR}/version_major MRN_VERSION_MAJOR) + file(READ ${MRN_SOURCE_DIR}/version_minor MRN_VERSION_MINOR) + file(READ ${MRN_SOURCE_DIR}/version_micro MRN_VERSION_MICRO)