From nobody Tue May 28 11:40:47 2024 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 4VpVvM1ns2z5M5XX; Tue, 28 May 2024 11:40:47 +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 4VpVvM1KzBz4c35; Tue, 28 May 2024 11:40:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716896447; 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=Yj43wcQKMhx5c011GHJVpbRQjDW3J5vm3FaVy8Poygk=; b=FF9FPvtf+a80r3A1lmsXOcVl1H3Gs2pCn6I2c3UXDgr+MxijUxs4LizjS9OEi7wiZOgeXD nsh2wbTv+p/DEsw9eeu/8oVucO61bUYm7P+73GshOxaE2jmsd81DWNrgh9Z7lZsOTkqCyK LXECByUSo6Lszb7f3CyD+BLpg/CldtJX3ap7nK/Eq+R7FEhxwq9JKor70lbv0ta8rAmgrS Nfy1i+5LJA97+5vIxm+bybKar8Kwe8YO3EtkwQqeFbe95EYVkImPCiA/JC5whJx614+UNB 3kqGfcartLyfkolmnvbZL3V4D+00iIzfHdsOJQpxNDhrj9gm6alEJGTSyp0QDg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716896447; a=rsa-sha256; cv=none; b=Xy6AC8PRPRhrRIe5lPUZZh9xIlM7ClozwzLgykbJaY7GrEYhFXT9MlWWMq3rSSmqnybteC 7cyWPr/GM46MTdoRk/PZfmRAc3yl9whidczWQkX+XmQW7WgwSXP/zuE2S/pWAB46m51OKF 6WKCQU2k8kegVXXptrYwwxwE0NyTfGLcWIO7UhrtGpxws70wdVVFuMZjjfJsD+Itzd+c+E 3S/d6AeJ2UYtdaUfLReRn4cV5jCLzFty+1dT2BeYthugV7RDVXO6UKXUm9FQSMAyat0V9c 1a4jt+y7Gq8L9J9MGmLvXgCYiELeAIMjP5ieU/ltzkoe2qVi70NL0kLNrZ0NuA== 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=1716896447; 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=Yj43wcQKMhx5c011GHJVpbRQjDW3J5vm3FaVy8Poygk=; b=JXICwtBF21huK53Q+YlyHNjeVopqtf9LhYpQU0WMg6RPIi+7VVex/HPtcb7f7r6005GKp4 H0NGx6qvK4wEsQfAO4iAHqeuYXpbrrDUhl27o4TgyfmqVKrFH27igh4GfJfCb+spYuxiNZ a1+FvdR/em7VFtIFEv+5qBACKrC0u5rmiHnJFtdj8i3D4xIXnBR56VicOpDdBgy30TyGLl Qx+UlPJxcHlxVaEbv/sibhD8sY2TCtg7j6nOhSHvU972qmDQH25iJ5VTVPAyKXSmiOw146 CD1bZCuFT7I8SUrCLxmkzNpg+5hC2+VZbnlhCHfkt1mgfH4FbDnMg2EKB8v1sg== 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 4VpVvM0rS2z1Q8S; Tue, 28 May 2024 11:40:47 +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 44SBeljU062899; Tue, 28 May 2024 11:40:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44SBelCq062896; Tue, 28 May 2024 11:40:47 GMT (envelope-from git) Date: Tue, 28 May 2024 11:40:47 GMT Message-Id: <202405281140.44SBelCq062896@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Pietro Cerutti Subject: git: fbc5b93e7f97 - main - lang/chicken: fix installation of data files from eggs 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gahr X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fbc5b93e7f971553aa2c3c0a3712d888ab66ef15 Auto-Submitted: auto-generated The branch main has been updated by gahr: URL: https://cgit.FreeBSD.org/ports/commit/?id=fbc5b93e7f971553aa2c3c0a3712d888ab66ef15 commit fbc5b93e7f971553aa2c3c0a3712d888ab66ef15 Author: Pietro Cerutti AuthorDate: 2024-05-28 11:38:47 +0000 Commit: Pietro Cerutti CommitDate: 2024-05-28 11:40:44 +0000 lang/chicken: fix installation of data files from eggs Upstream: https://code.call-cc.org/cgi-bin/gitweb.cgi?p=chicken-core.git;a=commitdiff;h=360e1c --- lang/chicken/Makefile | 2 +- lang/chicken/files/patch-egg-compile.scm | 26 ++++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/lang/chicken/Makefile b/lang/chicken/Makefile index 4edbbcc407d7..e63ae4f556ad 100644 --- a/lang/chicken/Makefile +++ b/lang/chicken/Makefile @@ -1,6 +1,6 @@ PORTNAME= chicken DISTVERSION= 5.3.0 -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 1 CATEGORIES= lang scheme MASTER_SITES= https://code.call-cc.org/releases/${DISTVERSION}/ diff --git a/lang/chicken/files/patch-egg-compile.scm b/lang/chicken/files/patch-egg-compile.scm new file mode 100644 index 000000000000..d17adafbc42e --- /dev/null +++ b/lang/chicken/files/patch-egg-compile.scm @@ -0,0 +1,26 @@ +From 360e1c423b5475fa2c1caba1f19d652538a8f322 Mon Sep 17 00:00:00 2001 +From: Peter Bex +Date: Mon, 31 Oct 2022 13:06:26 +0100 +Subject: [PATCH 1/1] Do not double call normalize-destination on share dir + +In install-random-files, don't call normalize-destination on the +destination directory - this is already done in compile-egg-info + +Before, we'd see things like in the install script like: + mkdir -p /path/to/chicken/path/to/chicken/share +With this patch, it becomes: + mkdir -p /path/to/chicken/share +which is as it should be. + +Signed-off-by: felix +--- egg-compile.scm.orig 2021-11-18 06:32:06 UTC ++++ egg-compile.scm +@@ -1051,7 +1051,7 @@ + (root (string-append srcdir "/")) + (mkdir (mkdir-command platform)) + (sfiles (map (cut prefix srcdir <>) files)) +- (dfile (qs* (normalize-destination dest mode) platform #t)) ++ (dfile (qs* dest platform #t)) + (ddir (shell-variable "DESTDIR" platform))) + (print "\n" mkdir " " ddir dfile) + (let-values (((ds fs) (partition directory? sfiles)))