From nobody Fri Sep 01 14:00:36 2023 X-Original-To: dev-commits-ports-all@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 4RcfnK1LPnz4rJCW; Fri, 1 Sep 2023 14:00:37 +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 4RcfnK0qglz4TFR; Fri, 1 Sep 2023 14:00:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693576837; 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=25fzx1ywVbz6QFO2fh9B/fF9pq3lxE0KI4eBHlgH0Qs=; b=ap09QrLmdA9b3HKBJHAQksRkq7+1N03SmzZGLjRlhiytlqG+lt7YoxOUQsA8arKNoQLGOt 3/5SIDnMcVIfcPWotDKmuLlaF8udTpiP+jalXVKZGRYIEWRaI61+AWPAvG7ng7+ehHNy7+ zvFu0DJSjemcKFt89MtSw33vRYOMWo0FmwqoFbvDA1na4qXfgV7ts/7b7Kl9und62MAYSH KknzRRtHA1zy/j1KNgMK98AzTmjQD+PBWP4ahGZp/rWmfDP6sx2EnT5/f7CvoNScwFSjva 2yM9Ijg3GDdqDSzalvm270OwXix1ogin2cgQzdSFNsdi4ufU8HASVlVgW3p7kg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693576837; a=rsa-sha256; cv=none; b=FmLUnxytAe7LyAi/MYeGlgkwc7JZBL449zU2Xd942pv8e4qLh7lI+w1xJKAK9GqugW9uK/ foGsOlJcq9VVduEHqTeYfchdE/5CGNFQeyp/5uB8tKdUTdIwVYqIO0jpwkOiRomnNEzAi3 6wAtkdFnDQ5TYsCfD+P9sHiTuoXNA8ktObzDM23FM8acrCG8vZGBY/BiEnoxyw5xw/KwDv zawN4tbeHfJTt/Cq3N4/qNc2WbBQhxn6At/8vtJDwW28a99dPUkOY//uQbPmcIgA9z2kTj CnvaeSAIoDv+nM25x4TQCcMmt6XrzQNpE+LqCR+bRtVJO+MUK0vuiQKHWNejaQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693576837; 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=25fzx1ywVbz6QFO2fh9B/fF9pq3lxE0KI4eBHlgH0Qs=; b=ukQV3RhRjqw0qKE/XmhEPVq0WADvz4hm11wV2mPMDZ34Lij8i00YIAPUBbcQwWTcGzVbHd vaC3Z3024fEa9VXyjXgoR8PeR5SqiI5r1bIBCeIz70PHz2jTUFr0RT35T7lIrvD9IrJZWz jW/BZ9hcro5EhHkf70Yp45nfH9Chpep3m+WiKBRb2N21ax8FDy83S08k1lcvQIqWy/mfjZ 20p9J00/hOAq3um4UgnpQ2fnDurtiYLVLKBIrZ+CAtodXJbPRUG2KhMn377uMjwrnlwsUz UZpM0t7HouqC0Wzhn773WtvA2ErWqwYQXnR8l+WPOZPP2E/9TJxd9qPtf6RBXg== 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 4RcfnJ6zRgz13Yn; Fri, 1 Sep 2023 14:00:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 381E0ajJ083481; Fri, 1 Sep 2023 14:00:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 381E0a8c083478; Fri, 1 Sep 2023 14:00:36 GMT (envelope-from git) Date: Fri, 1 Sep 2023 14:00:36 GMT Message-Id: <202309011400.381E0a8c083478@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Mikael Urankar Subject: git: 187f5dc16e9a - main - textproc/sonic: Fix build. List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mikael X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 187f5dc16e9ad4d10edc253c8bce31a1a8e5c91a Auto-Submitted: auto-generated The branch main has been updated by mikael: URL: https://cgit.FreeBSD.org/ports/commit/?id=187f5dc16e9ad4d10edc253c8bce31a1a8e5c91a commit 187f5dc16e9ad4d10edc253c8bce31a1a8e5c91a Author: Mikael Urankar AuthorDate: 2023-08-31 12:40:55 +0000 Commit: Mikael Urankar CommitDate: 2023-09-01 13:59:41 +0000 textproc/sonic: Fix build. Add missing distfiles --- textproc/sonic/Makefile | 4 ++++ textproc/sonic/distinfo | 4 +++- .../sonic/files/patch-cargo-crates_lindera-unidic-build.rs | 12 ++++++++++++ 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/textproc/sonic/Makefile b/textproc/sonic/Makefile index 1f8bd54ec2cd..2a731c333d17 100644 --- a/textproc/sonic/Makefile +++ b/textproc/sonic/Makefile @@ -2,6 +2,8 @@ PORTNAME= sonic DISTVERSIONPREFIX= v DISTVERSION= 1.4.1 CATEGORIES= textproc +MASTER_SITES+= https://clrd.ninjal.ac.jp/unidic_archive/cwj/2.1.2/:unidic +DISTFILES+= unidic-mecab-2.1.2_src.zip:unidic # check cargo-crates/lindera-unidic-XXX/build.rs MAINTAINER= mikael@FreeBSD.org COMMENT= Fast, lightweight, and schema-less search backend @@ -216,6 +218,8 @@ PLIST_FILES= bin/sonic \ PORTDOCS= CONFIGURATION.md PROTOCOL.md README.md OPTIONS_DEFINE= DOCS +CARGO_ENV+= DISTDIR=${DISTDIR} + post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/sonic @${MKDIR} ${STAGEDIR}${ETCDIR} diff --git a/textproc/sonic/distinfo b/textproc/sonic/distinfo index 5a44966cd55a..2c3bed178ab8 100644 --- a/textproc/sonic/distinfo +++ b/textproc/sonic/distinfo @@ -1,4 +1,6 @@ -TIMESTAMP = 1692815272 +TIMESTAMP = 1693485642 +SHA256 (unidic-mecab-2.1.2_src.zip) = 6cce98269214ce7de6159f61a25ffc5b436375c098cc86d6aa98c0605cbf90d4 +SIZE (unidic-mecab-2.1.2_src.zip) = 140517811 SHA256 (rust/crates/adler-1.0.2.crate) = f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe SIZE (rust/crates/adler-1.0.2.crate) = 12778 SHA256 (rust/crates/aes-0.8.3.crate) = ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2 diff --git a/textproc/sonic/files/patch-cargo-crates_lindera-unidic-build.rs b/textproc/sonic/files/patch-cargo-crates_lindera-unidic-build.rs new file mode 100644 index 000000000000..c764cb7eb4d8 --- /dev/null +++ b/textproc/sonic/files/patch-cargo-crates_lindera-unidic-build.rs @@ -0,0 +1,12 @@ +--- cargo-crates/lindera-unidic-0.24.0/build.rs.orig 2006-07-24 03:21:28 UTC ++++ cargo-crates/lindera-unidic-0.24.0/build.rs +@@ -56,7 +56,8 @@ fn main() -> Result<(), Box> { + dummy_matrix_def.write_all(b"0 1 0\n")?; + } else { + // Source file path for build package +- let source_path_for_build = Path::new(&build_dir).join(file_name); ++ let file_dir = env::var_os("DISTDIR").unwrap(); // ex) /usr/ports/distfiles ++ let source_path_for_build = Path::new(&file_dir).join(file_name); + + // Download source file to build directory + if !source_path_for_build.exists() {