From nobody Mon Feb 28 12:50:53 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 10B1319F2A05; Mon, 28 Feb 2022 12:50:56 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4K6gGk2vKBz3hYY; Mon, 28 Feb 2022 12:50:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646052654; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=66IaR0JHpuQu9a59ZUV+eMA1vHh2+icODJ+tFj9W9fQ=; b=KQJ/fhgCahW1jaFjCG5u/K04jm1vCGJtT/dTyh4d5PgfOfXAuq1/pICnUaOqKdwwqDB7GB yoQljAdhCCaNN6tAhEqGLKFwp7cpa+mne86D85175CrsJ7bffIGpDi/gGOcERpLu8cavcC 4rTJGBowXGrSdymm3p8ibJ2PBlhUJ8ydO/rpj6Y+JecCDn+7vGaiW9l16rHkx9o+yctM1l I57anF0ACdCmjIUqrclCz9RukqQFuqOVfBZvYwBPucU0CA01BLET8jxFageFjj5DsqIwU3 N0G2dLuZW00Us7EgN1RfuBAB7XTaAH6YAzSkxTXscAwwyjnBUpnLtKF04DVHyA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id EFC601B7F1; Mon, 28 Feb 2022 12:50:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 21SCorY7059233; Mon, 28 Feb 2022 12:50:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21SCorC2059232; Mon, 28 Feb 2022 12:50:53 GMT (envelope-from git) Date: Mon, 28 Feb 2022 12:50:53 GMT Message-Id: <202202281250.21SCorC2059232@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: a6f12135041b - main - databases/tarantool-c: Convert REINPLACE_CMD to patch files List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a6f12135041bc79af8a831d4f4d3d946ed1c27bc Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646052654; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=66IaR0JHpuQu9a59ZUV+eMA1vHh2+icODJ+tFj9W9fQ=; b=rhAOedUQOJBWb06T0OlBJBlLoY87Y2BYyTYziU13cl2hQOhRmdsO/x+MIJ3YqYW/DiKOSm EKSB6HG9aymbsIBlN7tUjPi8VunKsMakGU8LFflBrKXsfBAbwkyvf10u4en45v7VhQa1C+ LnZB2xkv7iwsWNzCH2mAUl/Pf/2am05dP7hgSEZtmKqUpfzO8I4xYAfjpOBswG+ZAEbpuE 1yo0hgLMOwN1jnM0SQ96G/DUw6o6EK1/r2ozFgLksOoqo2lOemkUlFOC0khoI8Loax6gsD +0AfOIveKJ0aqdHzwgKV5sdTh9CW9U/E6Bz4hcIc0klJsmAu0MsqFzI33ozXDA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646052654; a=rsa-sha256; cv=none; b=rEirbcJOoKX4t61r8IgiRA1UGq5DKZu6Fa2i2+6gVY3Y2OcJUt8gucEtUNO8hq1e6Etq7W Cq8PgsvPnOc90B1UTR/tgyI/mwwRPOPbiIfA8nkZUsvlt5oVEkXvb2sylW+N3mV9hxESam YfVrqGe+ae25gGzDY0CsxkMffRhM0VWrLvGkVnDmLeNK3Q17w4kYIQ+pREQaozI1l7iw5G UPf3b+hcr+Z39i9LcDWw7gYwXF7uWZ54Pw8f6OyoaHKL/wutYf9uFxO/4/CClcjiaVGrJ0 CTLxAvRwYgQG13zKwHK+3YqeVlqNolZ81ZH22ubksXFRD7/hMCsTwvBUXprOjw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=a6f12135041bc79af8a831d4f4d3d946ed1c27bc commit a6f12135041bc79af8a831d4f4d3d946ed1c27bc Author: Po-Chuan Hsieh AuthorDate: 2022-02-28 09:32:56 +0000 Commit: Po-Chuan Hsieh CommitDate: 2022-02-28 12:45:58 +0000 databases/tarantool-c: Convert REINPLACE_CMD to patch files --- databases/tarantool-c/Makefile | 4 ---- databases/tarantool-c/files/patch-CMakeLists.txt | 11 +++++++++++ databases/tarantool-c/files/patch-cmake-FindMsgPuck.cmake | 11 +++++++++++ databases/tarantool-c/files/patch-include_tp.h | 11 +++++++++++ databases/tarantool-c/files/patch-test-plain_test.c | 11 +++++++++++ 5 files changed, 44 insertions(+), 4 deletions(-) diff --git a/databases/tarantool-c/Makefile b/databases/tarantool-c/Makefile index b799bbf42e3e..958f9432a0e7 100644 --- a/databases/tarantool-c/Makefile +++ b/databases/tarantool-c/Makefile @@ -19,8 +19,4 @@ USE_GITHUB= yes GH_ACCOUNT= tarantool GH_TAGNAME= 2aa7937 -post-patch: - @${GREP} -lr 'msgpuck/msgpuck.h' ${WRKSRC}/ | ${XARGS} ${REINPLACE_CMD} -e 's|msgpuck/msgpuck.h|msgpuck.h|' - @${REINPLACE_CMD} -e 's|libmsgpuck.a|libmsgpuck.so|' ${WRKSRC}/cmake/FindMsgPuck.cmake - .include diff --git a/databases/tarantool-c/files/patch-CMakeLists.txt b/databases/tarantool-c/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..5ab36717da11 --- /dev/null +++ b/databases/tarantool-c/files/patch-CMakeLists.txt @@ -0,0 +1,11 @@ +--- CMakeLists.txt.orig 2021-11-26 15:16:51 UTC ++++ CMakeLists.txt +@@ -46,7 +46,7 @@ if (NOT ENABLE_BUNDLED_MSGPUCK) + set (MSGPUCK_REQUIRED ON) + include (cmake/FindMsgPuck.cmake) + include_directories(${MSGPUCK_INCLUDE_DIR}) +-elseif (NOT EXISTS "${PROJECT_SOURCE_DIR}/third_party/msgpuck/msgpuck.h") ++elseif (NOT EXISTS "${PROJECT_SOURCE_DIR}/third_party/msgpuck.h") + message(FATAL_ERROR "Could not find msgpuck development files") + else (NOT ENABLE_BUNDLED_MSGPUCK) + set (MSGPUCK_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/third_party") diff --git a/databases/tarantool-c/files/patch-cmake-FindMsgPuck.cmake b/databases/tarantool-c/files/patch-cmake-FindMsgPuck.cmake new file mode 100644 index 000000000000..640053688282 --- /dev/null +++ b/databases/tarantool-c/files/patch-cmake-FindMsgPuck.cmake @@ -0,0 +1,11 @@ +--- cmake/FindMsgPuck.cmake.orig 2021-11-26 15:16:51 UTC ++++ cmake/FindMsgPuck.cmake +@@ -7,7 +7,7 @@ + # + + find_path(MSGPUCK_INCLUDE_DIR msgpuck.h PATH_SUFFIXES msgpuck) +-find_library(MSGPUCK_LIBRARY NAMES libmsgpuck.a) ++find_library(MSGPUCK_LIBRARY NAMES libmsgpuck.so) + + include(FindPackageHandleStandardArgs) + find_package_handle_standard_args(MsgPuck diff --git a/databases/tarantool-c/files/patch-include_tp.h b/databases/tarantool-c/files/patch-include_tp.h new file mode 100644 index 000000000000..e12cea2444e4 --- /dev/null +++ b/databases/tarantool-c/files/patch-include_tp.h @@ -0,0 +1,11 @@ +--- include/tp.h.orig 2021-11-26 15:16:51 UTC ++++ include/tp.h +@@ -6,7 +6,7 @@ + #include + #include + +-#include ++#include + #include + #include + diff --git a/databases/tarantool-c/files/patch-test-plain_test.c b/databases/tarantool-c/files/patch-test-plain_test.c new file mode 100644 index 000000000000..0264a64711b0 --- /dev/null +++ b/databases/tarantool-c/files/patch-test-plain_test.c @@ -0,0 +1,11 @@ +--- test/plain_test.c.orig 2021-11-26 15:16:51 UTC ++++ test/plain_test.c +@@ -8,7 +8,7 @@ + + #include + +-#include ++#include + + #include +