Date: Tue, 28 May 2024 11:40:47 GMT From: Pietro Cerutti <gahr@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: fbc5b93e7f97 - main - lang/chicken: fix installation of data files from eggs Message-ID: <202405281140.44SBelCq062896@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by gahr: URL: https://cgit.FreeBSD.org/ports/commit/?id=fbc5b93e7f971553aa2c3c0a3712d888ab66ef15 commit fbc5b93e7f971553aa2c3c0a3712d888ab66ef15 Author: Pietro Cerutti <gahr@FreeBSD.org> AuthorDate: 2024-05-28 11:38:47 +0000 Commit: Pietro Cerutti <gahr@FreeBSD.org> 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 <peter@more-magic.net> +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 <felix@call-with-current-continuation.org> +--- 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)))
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202405281140.44SBelCq062896>